diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | b1276828b47cd0e050c7db6a6dd702ffc806f96a (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /www/apache | |
| parent | 4795460da1a16fd97804c0cfe23df962441269c8 (diff) | |
| download | pkgsrc-b1276828b47cd0e050c7db6a6dd702ffc806f96a.tar.gz | |
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.
This fixes PR pkg/26590.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index aed50b86b2c..df5a2bbd541 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2004/08/02 19:54:17 abs Exp $ +# $NetBSD: Makefile,v 1.150 2004/08/22 19:32:52 jlam 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). @@ -60,16 +60,11 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} -# Global and legacy options -.if defined(APACHE_PERF_TUNING) || defined(APACHE_SUEXEC) -. if !defined(PKG_OPTIONS.apache) -. if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) -PKG_OPTIONS.apache+= perf-tuning -. endif -. if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) -PKG_OPTIONS.apache+= suexec -. endif -. endif +.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 |