Build all modules shared if APACHE_MODULES=all-shared. Bump PKGREVISION.

approved by tron

2 files changed, 50 insertions, 2 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 87e2015c355..bf1c4059a5e 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2008/08/22 04:36:00 obache Exp $
+# $NetBSD: Makefile,v 1.30 2008/08/26 20:42:38 epg Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
@@ -102,7 +102,12 @@ DFLT_APACHE_MODULES+=	ldap authnz_ldap
 # APACHE_MODULES are the modules that are linked statically into the
 # apache httpd executable.
 #
+.if ${APACHE_MODULES} == "all-shared"
+CONFIGURE_ARGS+=	--enable-mods-shared=all
+PLIST_SRC+=		${PKGDIR}/PLIST.all-shared
+.else
 CONFIGURE_ARGS+=	--enable-modules=${APACHE_MODULES:Q}
+.endif
 BUILD_DEFS+=		APACHE_MODULES
 
 APACHE_USER?=		www
@@ -200,6 +205,11 @@ AP_DEPENDS.deflate=	../../devel/zlib/buildlink3.mk
 AP_CFG_ARGS.ssl=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_PREFIX.zlib}
 
+.if ${APACHE_MODULES} == "all-shared"
+.include "${AP_DEPENDS.ssl}"
+.include "${AP_DEPENDS.deflate}"
+CONFIGURE_ARGS+=	${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate}
+.else
 .for ap_mod in ${APACHE_MODULES}
 .  if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
 .    for ap_depend in ${AP_DEPENDS.${ap_mod}}
@@ -214,6 +224,7 @@ DEPENDS+=		${ap_depend}
 CONFIGURE_ARGS+=	${AP_CFG_ARGS.${ap_mod}}
 .  endif
 .endfor
+.endif
 
 post-extract:
 	${TOUCH} ${WRKSRC}/build/libtool
diff --git a/www/apache22/PLIST.all-shared b/www/apache22/PLIST.all-shared
new file mode 100644
index 00000000000..e730d009e1e
--- /dev/null
+++ b/www/apache22/PLIST.all-shared
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST.all-shared,v 1.1 2008/08/26 20:42:38 epg Exp $
+lib/httpd/mod_auth_basic.so
+lib/httpd/mod_auth_digest.so
+lib/httpd/mod_authn_anon.so
+lib/httpd/mod_authn_dbd.so
+lib/httpd/mod_authn_dbm.so
+lib/httpd/mod_authn_default.so
+lib/httpd/mod_authn_file.so
+lib/httpd/mod_authz_dbm.so
+lib/httpd/mod_authz_default.so
+lib/httpd/mod_authz_groupfile.so
+lib/httpd/mod_authz_host.so
+lib/httpd/mod_authz_owner.so
+lib/httpd/mod_authz_user.so
+lib/httpd/mod_cern_meta.so
+lib/httpd/mod_dav.so
+lib/httpd/mod_dav_fs.so
+lib/httpd/mod_dbd.so
+lib/httpd/mod_deflate.so
+lib/httpd/mod_dumpio.so
+lib/httpd/mod_expires.so
+lib/httpd/mod_ext_filter.so
+lib/httpd/mod_filter.so
+lib/httpd/mod_headers.so
+lib/httpd/mod_ident.so
+lib/httpd/mod_imagemap.so
+lib/httpd/mod_info.so
+lib/httpd/mod_log_forensic.so
+lib/httpd/mod_logio.so
+lib/httpd/mod_mime_magic.so
+lib/httpd/mod_rewrite.so
+lib/httpd/mod_speling.so
+lib/httpd/mod_substitute.so
+lib/httpd/mod_unique_id.so
+lib/httpd/mod_usertrack.so
+lib/httpd/mod_version.so
+lib/httpd/mod_vhost_alias.so