diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2002-06-27 00:22:40 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2002-06-27 00:22:40 +0000 |
| commit | d1eb2ba3f9e53a854a88133003458e10460b19aa (patch) | |
| tree | 23feb61a278fef459d15654c19fe517241f3f232 /www/apache21/Makefile | |
| parent | Fixed bad patch. Missed it when we moved to the rerolled tarball apparently. (diff) | |
o Fix the htpasswd logic bug around -c and -n options
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2)
o Bump PORTREVISION
Prompted by: Jon Noack <noackjr@rice.edu> (htpasswd)
Obtained from: Apache Project's CVS (htpasswd)
Notes
Notes:
svn path=/head/; revision=62064
Diffstat (limited to 'www/apache21/Makefile')
| -rw-r--r-- | www/apache21/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 1503ee0a4510..25fb8c3c2d73 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.39 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz MAINTAINER?= perky@fallin.lv +LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2 + LATEST_LINK= apache2 WITH_MPM?= prefork # or worker, perchild @@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-so \ --with-mpm=${WITH_MPM} \ --with-port=${HTTP_PORT} \ + --with-expat=${LOCALBASE} \ --libdir=${PREFIX_RELDEST}/lib/apache2 \ --includedir=${PREFIX_RELDEST}/include/apache2 CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \ @@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes MAKE_ENV+= -DNOPORTDOCS .endif -.if !defined(WITHOUT_BUNDLED_EXPAT) -EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat -PLIST_SUB+= EXPAT="" -.else -LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2 -EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,} -PLIST_SUB+= EXPAT="@comment " -.endif - .if defined(WITH_SUEXEC) SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data SUEXEC_USERDIR?= public_html @@ -132,8 +126,6 @@ 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' \ - ${WRKSRC}/srclib/apr-util/configure @${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \; @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh @${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout |