summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-24 07:39:50 +0000
committerjlam <jlam@pkgsrc.org>2004-11-24 07:39:50 +0000
commit4835cf969a4166cd4e428a46987b9a3f8a729501 (patch)
treef8d707924f63f1879e1046d51177dd31251fc917 /www/apache2
parentd5a13ff651f67ea5ec46eda76b3807501bc044db (diff)
downloadpkgsrc-4835cf969a4166cd4e428a46987b9a3f8a729501.tar.gz
There are additional headers installed if APACHE_MPM == "worker".
Handle this with the usual PLIST_SUBST magic.
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile7
-rw-r--r--www/apache2/PLIST4
2 files changed, 9 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 5b256cf06a2..724098ba6c6 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2004/11/23 00:37:04 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2004/11/24 07:39:50 jlam Exp $
.include "Makefile.common"
@@ -41,6 +41,11 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
APACHE_MPM?= prefork
CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM}
BUILD_DEFS+= APACHE_MPM
+.for _mpm_ in prefork worker
+PLIST_SUBST.${_mpm_}?= MPM_COMMENT.${_mpm_}="@comment "
+PLIST_SUBST+= ${PLIST_SUBST.${_mpm_}}
+.endfor
+PLIST_SUBST.${APACHE_MPM}= MPM_COMMENT.${APACHE_MPM}=
DFLT_APACHE_MODULES= all
DFLT_APACHE_MODULES+= proxy proxy_connect proxy_ftp proxy_http
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index fd8a46423fb..b37f717e7f8 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2004/10/02 16:38:38 reed Exp $
+@comment $NetBSD: PLIST,v 1.26 2004/11/24 07:39:50 jlam Exp $
include/httpd/ap_compat.h
include/httpd/ap_config.h
include/httpd/ap_config_auto.h
@@ -9,6 +9,7 @@ include/httpd/ap_mpm.h
include/httpd/ap_provider.h
include/httpd/ap_regkey.h
include/httpd/ap_release.h
+${MPM_COMMENT.worker}include/httpd/fdqueue.h
include/httpd/http_config.h
include/httpd/http_connection.h
include/httpd/http_core.h
@@ -32,6 +33,7 @@ include/httpd/mpm_default.h
include/httpd/os.h
include/httpd/pcre.h
include/httpd/pcreposix.h
+${MPM_COMMENT.worker}include/httpd/pod.h
include/httpd/rfc1413.h
include/httpd/scoreboard.h
include/httpd/ssl_expr.h