From e55081b7661844a824a57b13c2e7b868c66ebbee Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Sun, 26 May 2002 13:25:04 +0000 Subject: - Better WITH_SUEXEC support - Build with textproc/expat2 unless defined(WITH_BUNDLED_EXPAT) PR: 38552 Submitted by: maintainer --- www/apache21/Makefile | 30 ++++++++++++++++++---- www/apache21/files/patch-srclib:apr-util:configure | 11 -------- www/apache21/pkg-plist | 20 +++++++-------- 3 files changed, 35 insertions(+), 26 deletions(-) delete mode 100644 www/apache21/files/patch-srclib:apr-util:configure (limited to 'www/apache21') diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 22f1abad1226..af142c3f42ca 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.36 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ @@ -39,8 +40,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --includedir=${PREFIX}/include/apache2 CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" -SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \ - deflate bucketeer +SHARED_MODULES= all cgid ext_filter bucketeer RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g' MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes PLIST_SUB+= DESTDIR=${DESTDIR} @@ -49,6 +49,15 @@ PLIST_SUB+= DESTDIR=${DESTDIR} MAKE_ENV+= NOPORTDOCS=YES .endif +.if defined(WITH_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} ${EXPATLIBPATH} +PLIST_SUB+= EXPAT="@comment " +.endif + .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .endif @@ -63,14 +72,16 @@ RC_SUB+= -e 's,@@SSL@@,,g' .endif .if defined(WITH_SUEXEC) +SUEXEC_DOCROOT?= ${PREFIX}/www/data SUEXEC_USERDIR?= public_html CONFIGURE_ARGS+= --enable-suexec \ --with-suexec-caller=www \ - --with-suexec-userdir="${SUEXEC_USERDIR}" \ --with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \ - --with-suexec-docroot="${PREFIX}/www/data" \ + --with-suexec-userdir="${SUEXEC_USERDIR}" \ + --with-suexec-docroot="${SUEXEC_DOCROOT}" \ --with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \ - --with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" + --with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \ + --with-suexec-bin="${PREFIX}/sbin/suexec" PLIST_SUB+= SUEXEC="" .else PLIST_SUB+= SUEXEC="@comment " @@ -90,6 +101,13 @@ PLIST_SUB+= MODPROXY="" PLIST_SUB+= MODPROXY="@comment " .endif +.if defined(WITH_EXPERIMENTAL) +SHARED_MODULES+= case_filter case_filter_in deflate ext_filter charset_lite +PLIST_SUB+= EXPERIMENTAL="" +.else +PLIST_SUB+= EXPERIMENTAL="@comment " +.endif + .if ${WITH_MPM} != "prefork" PKGNAMESUFFIX= -${WITH_MPM} .if !defined(WITH_THREADS) @@ -113,6 +131,8 @@ post-patch: ${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]">${WRKDIR}/apache2.sh @${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout diff --git a/www/apache21/files/patch-srclib:apr-util:configure b/www/apache21/files/patch-srclib:apr-util:configure deleted file mode 100644 index 755790d2b41c..000000000000 --- a/www/apache21/files/patch-srclib:apr-util:configure +++ /dev/null @@ -1,11 +0,0 @@ ---- srclib/apr-util/configure.orig Wed May 1 13:52:45 2002 -+++ srclib/apr-util/configure Tue May 7 19:34:07 2002 -@@ -11419,7 +11419,7 @@ - fi; - - if test -z "$expat_include_dir"; then -- for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do -+ for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do - - echo "$as_me:$LINENO: checking for Expat in $d" >&5 - echo $ECHO_N "checking for Expat in $d... $ECHO_C" >&6 diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index f381ec5c91f1..22cd156780ce 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -77,7 +77,7 @@ include/apache2/apr_xlate.h include/apache2/apr_xml.h include/apache2/apu.h include/apache2/apu_compat.h -include/apache2/expat.h +%%EXPAT%%include/apache2/expat.h include/apache2/http_config.h include/apache2/http_connection.h include/apache2/http_core.h @@ -130,11 +130,11 @@ lib/apache2/libaprutil.la lib/apache2/libaprutil.so.0 @unexec rm -f %D/lib/apache2/libaprutil.so @exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so -lib/apache2/libexpat.a -lib/apache2/libexpat.la -lib/apache2/libexpat.so.1 -@unexec rm -f %D/lib/apache2/libexpat.so -@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so +%%EXPAT%%lib/apache2/libexpat.a +%%EXPAT%%lib/apache2/libexpat.la +%%EXPAT%%lib/apache2/libexpat.so.1 +%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so +%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so libexec/apache2/httpd.exp libexec/apache2/mod_access.so libexec/apache2/mod_actions.so @@ -147,15 +147,15 @@ libexec/apache2/mod_auth_digest.so libexec/apache2/mod_autoindex.so libexec/apache2/mod_bucketeer.so %%MODCACHE%%libexec/apache2/mod_cache.so -libexec/apache2/mod_case_filter.so -libexec/apache2/mod_case_filter_in.so +%%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so +%%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so libexec/apache2/mod_cern_meta.so libexec/apache2/mod_cgi.so libexec/apache2/mod_cgid.so -libexec/apache2/mod_charset_lite.so +%%EXPERIMENTAL%%libexec/apache2/mod_charset_lite.so libexec/apache2/mod_dav.so libexec/apache2/mod_dav_fs.so -libexec/apache2/mod_deflate.so +%%EXPERIMENTAL%%libexec/apache2/mod_deflate.so libexec/apache2/mod_dir.so %%MODCACHE%%libexec/apache2/mod_disk_cache.so libexec/apache2/mod_env.so -- cgit v1.2.3