From cc75ab77f21a464a1fceaa282de5a4070387d30c Mon Sep 17 00:00:00 2001
From: Hye-Shik Chang <perky@FreeBSD.org>
Date: Sun, 14 Jul 2002 03:57:59 +0000
Subject: o Install mod_deflate by default o Add mod_bucketeer and
 mod_optional_* modules to WITH_EXPERIMENTAL modules o Bump port revision

PR:		40529
Submitted by:	Lawrence Ho <lawrenceho@fastmail.fm>
---
 www/apache21/Makefile  | 8 +++++---
 www/apache21/pkg-plist | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'www/apache21')

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 0ac27872cee5..60b6fd39586c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.39
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -44,7 +44,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
-SHARED_MODULES= all cgid ext_filter bucketeer
+SHARED_MODULES= all cgid deflate ext_filter
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
@@ -106,7 +106,9 @@ PLIST_SUB+=	MODPROXY="@comment "
 .endif
 
 .if defined(WITH_EXPERIMENTAL)
-SHARED_MODULES+= case_filter case_filter_in deflate ext_filter charset_lite
+SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
+		optional_hook_export optional_hook_import \
+		optional_fn_import optional_fn_export
 PLIST_SUB+=	EXPERIMENTAL=""
 .else
 PLIST_SUB+=	EXPERIMENTAL="@comment "
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 29da7ea06294..d9b0fba27484 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -140,7 +140,7 @@ libexec/apache2/mod_auth_anon.so
 libexec/apache2/mod_auth_dbm.so
 libexec/apache2/mod_auth_digest.so
 libexec/apache2/mod_autoindex.so
-libexec/apache2/mod_bucketeer.so
+%%EXPERIMENTAL%%libexec/apache2/mod_bucketeer.so
 %%MODCACHE%%libexec/apache2/mod_cache.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so
@@ -150,7 +150,7 @@ libexec/apache2/mod_cgid.so
 %%EXPERIMENTAL%%libexec/apache2/mod_charset_lite.so
 libexec/apache2/mod_dav.so
 libexec/apache2/mod_dav_fs.so
-%%EXPERIMENTAL%%libexec/apache2/mod_deflate.so
+libexec/apache2/mod_deflate.so
 libexec/apache2/mod_dir.so
 %%MODCACHE%%libexec/apache2/mod_disk_cache.so
 libexec/apache2/mod_env.so
@@ -166,6 +166,10 @@ libexec/apache2/mod_log_config.so
 libexec/apache2/mod_mime.so
 libexec/apache2/mod_mime_magic.so
 libexec/apache2/mod_negotiation.so
+%%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_export.so
+%%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_import.so
+%%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_import.so
+%%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_export.so
 %%MODPROXY%%libexec/apache2/mod_proxy.so
 %%MODPROXY%%libexec/apache2/mod_proxy_connect.so
 %%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
-- 
cgit v1.2.3