diff options
| author | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
| commit | 9c435d97cc677d79b74e5e372fd22ec4b57a0a65 (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /www/apache | |
| parent | 6dd27214ac3a362082f3cc1b2ef37b2add1db468 (diff) | |
| download | pkgsrc-9c435d97cc677d79b74e5e372fd22ec4b57a0a65.tar.gz | |
Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also,
make use of PKG_OPTIONS_LEGACY_VARS.
Reviewed by wiz.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 5abc47c179c..25688a9459c 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.165 2005/05/17 19:11:47 jlam Exp $ +# $NetBSD: Makefile,v 1.166 2005/05/31 10:01:40 dillo Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -64,15 +64,11 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} -.if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) -PKG_DEFAULT_OPTIONS+= perf-tuning -.endif -.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) -PKG_DEFAULT_OPTIONS+= suexec -.endif - PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= perf-tuning suexec +PKG_OPTIONS_LEGACY_VARS+= APACHE_PERF_TUNING:perf-tuning +PKG_OPTIONS_LEGACY_VARS+= APACHE_SUEXEC:suexec + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuexec) |