Overhaul option and package list handling:

1.) Add missing modules "mod_proxy_scgi.so" and "mod_reqtimeout.so"
    if the package is built with shared modules enabled.
    This fixes PR pkg/43229 by Ryo HAYASAKA.
2.) Get rid of "PLIST.worker" and use "PLIST_VARS" instead.
3.) Use an option group instead of the "APACHE_MPM" configuration variable
    to configure the worker model.
4.) Enable the "apache-shared-modules" options by default. This provides
    more flexibility and matches the behaviour of a lot of other
    platforms e.g. Solaris or Linux distributions like Ubuntu.

Bump the package revision as the binary package will change by default.

4 files changed, 34 insertions, 28 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 793043a627c..82fffee4c64 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2010/03/09 02:30:15 taca Exp $
+# $NetBSD: Makefile,v 1.57 2010/04/30 16:30:09 tron Exp $
 
 DISTNAME=	httpd-2.2.15
+PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
@@ -15,8 +16,6 @@ LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS=	apache-{,*ssl}-[0-9]* apache6-[0-9]*
-
 BUILD_DEFS+=	IPV6_READY
 BUILD_DEFS+=	VARBASE
 
@@ -53,24 +52,6 @@ APACHE_MODULES?=	${DFLT_APACHE_MODULES}
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 
-# Set the "Multi-Processing Model" used by Apache to handle requests.
-# Valid values are:
-# 	event		multi-threaded based in worker, designed
-# 			to allow more requests to be served
-# 			simultaneously by passing off some processing
-# 			work to supporting threads.
-# 			BEWARE: does not work with SSL or input filters.
-#	prefork		non-threaded, pre-forking web server
-#	worker		hybrid multi-threaded multi-process web server
-#
-APACHE_MPM?=		prefork
-CONFIGURE_ARGS+=	--with-mpm=${APACHE_MPM:Q}
-BUILD_DEFS+=		APACHE_MPM
-
-.if !empty(APACHE_MPM:Mevent) || !empty(APACHE_MPM:Mworker)
-PLIST_SRC+=		${PKGDIR}/PLIST.worker
-.endif
-
 CONFIGURE_ARGS+=	--disable-include
 CONFIGURE_ARGS+=	--disable-log-config
 CONFIGURE_ARGS+=	--disable-env
diff --git a/www/apache22/PLIST b/www/apache22/PLIST
index e05bbaadb02..c0fa34843ea 100644
--- a/www/apache22/PLIST
+++ b/www/apache22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/03/09 02:30:15 taca Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/04/30 16:30:09 tron Exp $
 ${PLIST.suexec}sbin/suexec
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -12,6 +12,7 @@ include/httpd/ap_regex.h
 include/httpd/ap_regkey.h
 include/httpd/ap_release.h
 include/httpd/http_config.h
+${PLIST.worker}include/httpd/fdqueue.h
 include/httpd/http_connection.h
 include/httpd/http_core.h
 include/httpd/http_log.h
@@ -35,6 +36,7 @@ include/httpd/mpm.h
 include/httpd/mpm_common.h
 include/httpd/mpm_default.h
 include/httpd/os.h
+${PLIST.worker}include/httpd/pod.h
 include/httpd/scoreboard.h
 include/httpd/unixd.h
 include/httpd/util_cfgtree.h
@@ -109,6 +111,8 @@ ${PLIST.all-shared}lib/httpd/mod_proxy_balancer.so
 ${PLIST.all-shared}lib/httpd/mod_proxy_connect.so
 ${PLIST.all-shared}lib/httpd/mod_proxy_ftp.so
 ${PLIST.all-shared}lib/httpd/mod_proxy_http.so
+${PLIST.all-shared}lib/httpd/mod_proxy_scgi.so
+${PLIST.all-shared}lib/httpd/mod_reqtimeout.so
 ${PLIST.all-shared}lib/httpd/mod_rewrite.so
 ${PLIST.all-shared}lib/httpd/mod_setenvif.so
 ${PLIST.all-shared}lib/httpd/mod_speling.so
diff --git a/www/apache22/PLIST.worker b/www/apache22/PLIST.worker
deleted file mode 100644
index b312905dfc6..00000000000
--- a/www/apache22/PLIST.worker
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.worker,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
-include/httpd/fdqueue.h
-include/httpd/pod.h
diff --git a/www/apache22/options.mk b/www/apache22/options.mk
index b210a8e4f01..c536b6513d8 100644
--- a/www/apache22/options.mk
+++ b/www/apache22/options.mk
@@ -1,10 +1,34 @@
-# $NetBSD: options.mk,v 1.6 2009/04/08 17:03:25 tron Exp $
+# $NetBSD: options.mk,v 1.7 2010/04/30 16:30:09 tron Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
-PKG_SUPPORTED_OPTIONS=	apache-shared-modules suexec
+PKG_OPTIONS_VAR=		PKG_OPTIONS.apache
+PKG_OPTIONS_REQUIRED_GROUPS=	mpm
+PKG_OPTIONS_GROUP.mpm=		apache-mpm-event apache-mpm-prefork apache-mpm-worker
+PKG_SUPPORTED_OPTIONS=		apache-shared-modules suexec
+PKG_SUGGESTED_OPTIONS=		apache-shared-modules apache-mpm-prefork
 
 .include "../../mk/bsd.options.mk"
 
+# Set the "Multi-Processing Model" used by Apache to handle requests.
+# Valid values are:
+# 	event		multi-threaded based in worker, designed
+# 			to allow more requests to be served
+# 			simultaneously by passing off some processing
+# 			work to supporting threads.
+# 			BEWARE: does not work with SSL or input filters.
+#	prefork		non-threaded, pre-forking web server
+#	worker		hybrid multi-threaded multi-process web server
+#
+PLIST_VARS+=		worker
+.if !empty(PKG_OPTIONS:Mapache-mpm-event)
+CONFIGURE_ARGS+=	--with-mpm=event
+PLIST.worker=		yes
+.elif !empty(PKG_OPTIONS:Mapache-mpm-worker)
+CONFIGURE_ARGS+=	--with-mpm=worker
+PLIST.worker=		yes
+.else
+CONFIGURE_ARGS+=	--with-mpm=prefork
+.endif
+
 # APACHE_MODULES are the modules that are linked statically into the
 # apache httpd executable.
 #