summaryrefslogtreecommitdiff
path: root/www/apache20
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2002-06-20 11:03:08 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2002-06-20 11:03:08 +0000
commit490ffcf406405dcea7bf43ada78a55f618d36077 (patch)
tree44307c1a5694a7f2334a01c357a6c0f7441d8bfc /www/apache20
parentUpdate port to version 7.7.1 (diff)
* Always use /bin/sh for configure and build.
* Fix EXPAT_PATHS substitution on 4.4. Submitted by: maintainer Hye-Shik Chang <perky@fallin.lv>
Notes
Notes: svn path=/head/; revision=61629
Diffstat (limited to 'www/apache20')
-rw-r--r--www/apache20/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 2002c2a53852..218a4e452bde 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
+ LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
SHARED_MODULES= all cgid ext_filter bucketeer
PREFIX_RELDEST= ${PREFIX:S,${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
@@ -133,7 +133,7 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif" \
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
- @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
+ @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh