diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /www/apache2 | |
| parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
| download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 9 | ||||
| -rw-r--r-- | www/apache2/PLIST | 8 | ||||
| -rw-r--r-- | www/apache2/options.mk | 7 |
3 files changed, 10 insertions, 14 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index eb469418273..ae477a0a82b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2008/01/21 14:37:22 taca Exp $ +# $NetBSD: Makefile,v 1.122 2008/04/12 22:43:13 jlam Exp $ .include "Makefile.common" @@ -46,11 +46,8 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES} APACHE_MPM?= prefork CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM:Q} 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}= +PLIST_VARS+= mpm-prefork mpm-worker +PLIST.${APACHE_MPM}= yes CONFIGURE_ARGS+= --disable-access CONFIGURE_ARGS+= --disable-auth diff --git a/www/apache2/PLIST b/www/apache2/PLIST index 749cf6a4ef3..e4eaa59e828 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2007/09/07 23:11:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.36 2008/04/12 22:43:13 jlam Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -9,7 +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 +${PLIST.mpm-worker}include/httpd/fdqueue.h include/httpd/http_config.h include/httpd/http_connection.h include/httpd/http_core.h @@ -33,7 +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 +${PLIST.mpm-worker}include/httpd/pod.h include/httpd/rfc1413.h include/httpd/scoreboard.h include/httpd/ssl_expr.h @@ -79,7 +79,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec +${PLIST.suexec}sbin/suexec share/examples/httpd/highperformance-std.conf share/examples/httpd/httpd-std.conf share/examples/httpd/magic diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 072af02318b..0726f306c94 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2007/07/04 20:55:03 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" +PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH @@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS -PLIST_SUBST+= SUEXEC_COMMENT= -.else -PLIST_SUBST+= SUEXEC_COMMENT="@comment " +PLIST.suexec= yes .endif |