- drop non-existent configure args

- add missing modules to DFLT_APACHE_MODULES
- bump PKGREVISION for new modules
- replace APACHE_MODULES=all-shared with apache-shared-modules option
- '--enable-mods-shared=all' is not sufficient, that's why DFLT_APACHE_MODULES
  lists all those others; use DFLT_APACHE_MODULES instead of 'all'
- add apache-shared-modules to options.description

approved by tron

3 files changed, 49 insertions, 13 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index c7fde263724..baebe10b73d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/09/16 01:47:06 epg Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
@@ -64,8 +64,6 @@ BUILD_DEFS+=		APACHE_MPM
 PLIST_SRC+=		${PKGDIR}/PLIST.worker
 .endif
 
-CONFIGURE_ARGS+=	--disable-access
-CONFIGURE_ARGS+=	--disable-auth
 CONFIGURE_ARGS+=	--disable-include
 CONFIGURE_ARGS+=	--disable-log-config
 CONFIGURE_ARGS+=	--disable-env
@@ -77,7 +75,6 @@ CONFIGURE_ARGS+=	--disable-asis
 CONFIGURE_ARGS+=	--disable-cgi
 CONFIGURE_ARGS+=	--disable-negotiation
 CONFIGURE_ARGS+=	--disable-dir
-CONFIGURE_ARGS+=	--disable-imap
 CONFIGURE_ARGS+=	--disable-actions
 CONFIGURE_ARGS+=	--disable-userdir
 CONFIGURE_ARGS+=	--disable-alias
@@ -91,6 +88,7 @@ DFLT_APACHE_MODULES+=	actions userdir alias isapi file_cache
 DFLT_APACHE_MODULES+=	cache disk_cache mem_cache bucketeer echo
 DFLT_APACHE_MODULES+=	example case_filter case_filter_in
 DFLT_APACHE_MODULES+=	charset_lite
+DFLT_APACHE_MODULES+=	cgid dav_lock proxy_ajp proxy_balancer
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
@@ -99,11 +97,15 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 DFLT_APACHE_MODULES+=	ldap authnz_ldap
 .endif
 
+.include "options.mk"
+
 # 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
+#.if ${APACHE_MODULES} == "all-shared"
+.if !empty(PKG_OPTIONS:Mapache-shared-modules)
+# XXX ldap and suexec?
+CONFIGURE_ARGS+=	--enable-mods-shared=${DFLT_APACHE_MODULES:Q}
 PLIST_SRC+=		${PKGDIR}/PLIST.all-shared
 .else
 CONFIGURE_ARGS+=	--enable-modules=${APACHE_MODULES:Q}
@@ -191,8 +193,6 @@ SUBST_MESSAGE.abs_srcdir=	Fixing abs_srcdir
 
 REPLACE_PERL=		docs/cgi-examples/printenv
 
-.include "options.mk"
-
 # Add dependencies for the modules that will be built.  For each module
 # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
 # separated list of dependencies or buildlink3.mk files needed to build
@@ -205,7 +205,8 @@ 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"
+#.if ${APACHE_MODULES} == "all-shared"
+.if !empty(PKG_OPTIONS:Mapache-shared-modules)
 .include "${AP_DEPENDS.ssl}"
 .include "${AP_DEPENDS.deflate}"
 CONFIGURE_ARGS+=	${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate}
diff --git a/www/apache22/PLIST.all-shared b/www/apache22/PLIST.all-shared
index e730d009e1e..26418faf8d7 100644
--- a/www/apache22/PLIST.all-shared
+++ b/www/apache22/PLIST.all-shared
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST.all-shared,v 1.1 2008/08/26 20:42:38 epg Exp $
+@comment $NetBSD: PLIST.all-shared,v 1.2 2008/09/16 01:47:06 epg Exp $
+lib/httpd/mod_actions.so
+lib/httpd/mod_alias.so
+lib/httpd/mod_asis.so
 lib/httpd/mod_auth_basic.so
 lib/httpd/mod_auth_digest.so
+lib/httpd/mod_authn_alias.so
 lib/httpd/mod_authn_anon.so
 lib/httpd/mod_authn_dbd.so
 lib/httpd/mod_authn_dbm.so
@@ -12,26 +16,57 @@ 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_autoindex.so
+lib/httpd/mod_bucketeer.so
+lib/httpd/mod_cache.so
+lib/httpd/mod_case_filter.so
+lib/httpd/mod_case_filter_in.so
 lib/httpd/mod_cern_meta.so
+lib/httpd/mod_cgi.so
+lib/httpd/mod_cgid.so
+lib/httpd/mod_charset_lite.so
 lib/httpd/mod_dav.so
 lib/httpd/mod_dav_fs.so
+lib/httpd/mod_dav_lock.so
 lib/httpd/mod_dbd.so
 lib/httpd/mod_deflate.so
+lib/httpd/mod_dir.so
+lib/httpd/mod_disk_cache.so
 lib/httpd/mod_dumpio.so
+lib/httpd/mod_echo.so
+lib/httpd/mod_env.so
+lib/httpd/mod_example.so
 lib/httpd/mod_expires.so
 lib/httpd/mod_ext_filter.so
+lib/httpd/mod_file_cache.so
 lib/httpd/mod_filter.so
 lib/httpd/mod_headers.so
 lib/httpd/mod_ident.so
 lib/httpd/mod_imagemap.so
+lib/httpd/mod_include.so
 lib/httpd/mod_info.so
+lib/httpd/mod_isapi.so
+lib/httpd/mod_log_config.so
 lib/httpd/mod_log_forensic.so
 lib/httpd/mod_logio.so
+lib/httpd/mod_mem_cache.so
+lib/httpd/mod_mime.so
 lib/httpd/mod_mime_magic.so
+lib/httpd/mod_negotiation.so
+lib/httpd/mod_proxy.so
+lib/httpd/mod_proxy_ajp.so
+lib/httpd/mod_proxy_balancer.so
+lib/httpd/mod_proxy_connect.so
+lib/httpd/mod_proxy_ftp.so
+lib/httpd/mod_proxy_http.so
 lib/httpd/mod_rewrite.so
+lib/httpd/mod_setenvif.so
 lib/httpd/mod_speling.so
+lib/httpd/mod_ssl.so
+lib/httpd/mod_status.so
 lib/httpd/mod_substitute.so
 lib/httpd/mod_unique_id.so
+lib/httpd/mod_userdir.so
 lib/httpd/mod_usertrack.so
 lib/httpd/mod_version.so
 lib/httpd/mod_vhost_alias.so
diff --git a/www/apache22/options.mk b/www/apache22/options.mk
index 12e6d5cbc28..77695d81817 100644
--- a/www/apache22/options.mk
+++ b/www/apache22/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2008/08/22 04:36:00 obache Exp $
+# $NetBSD: options.mk,v 1.5 2008/09/16 01:47:06 epg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
-PKG_SUPPORTED_OPTIONS=	suexec
+PKG_SUPPORTED_OPTIONS=	apache-shared-modules suexec
 
 .include "../../mk/bsd.options.mk"