[pkgsrc/trunk]: pkgsrc/www/apache2 There are additional headers installed if ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc49b036a9f5
branches:  trunk
changeset: 484073:bc49b036a9f5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 24 07:39:50 2004 +0000

description:
There are additional headers installed if APACHE_MPM == "worker".
Handle this with the usual PLIST_SUBST magic.

diffstat:

 www/apache2/Makefile |  7 ++++++-
 www/apache2/PLIST    |  4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r 41609e59034a -r bc49b036a9f5 www/apache2/Makefile
--- a/www/apache2/Makefile      Wed Nov 24 02:38:45 2004 +0000
+++ b/www/apache2/Makefile      Wed Nov 24 07:39:50 2004 +0000
@@ -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 @@
 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 -r 41609e59034a -r bc49b036a9f5 www/apache2/PLIST
--- a/www/apache2/PLIST Wed Nov 24 02:38:45 2004 +0000
+++ b/www/apache2/PLIST Wed Nov 24 07:39:50 2004 +0000
@@ -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_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/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