diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | 5cc6a7c1f324655a55780f73b3d7d11d39d55ec5 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /www/php4 | |
| parent | a3f9a03576685fb9a6a35d58b1695247504fc00a (diff) | |
| download | pkgsrc-5cc6a7c1f324655a55780f73b3d7d11d39d55ec5.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/php4')
| -rw-r--r-- | www/php4/Makefile.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 058a92e64c7..ecf3c55cbc2 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.16 2004/07/30 21:05:43 jlam Exp $ +# $NetBSD: Makefile.php,v 1.17 2004/08/22 19:32:52 jlam Exp $ .include "../../www/php4/Makefile.common" @@ -6,7 +6,7 @@ PKGREVISION= # empty DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo -PATCHDIR= ${.CURDIR}/../../www/php4/patches +PATCHDIR= ${.CURDIR}/../../www/php4/patches USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -42,17 +42,12 @@ CONFIGURE_ARGS+= ${PHP4_CONFIGURE_ARGS} CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//} - # Global and legacy options -.if defined(USE_SSL) -. if !defined(${PKG_OPTIONS_VAR}) -. if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss]) -${PKG_OPTIONS_VAR}+= ssl -. endif -. endif +.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= ssl .endif +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//} PKG_SUPPORTED_OPTIONS+= ssl .include "../../mk/bsd.options.mk" |