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.

3 files changed, 23 insertions, 44 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
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 21dde3d76d2..2da1436b9f1 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,27 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
 
-# Global and legacy options
-.if defined(LYNX_SCREEN_LIB) || defined(USE_SOCKS) || defined(USE_INET6)
-.  if !defined(PKG_OPTIONS.lynx)
-.    if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang)
-PKG_OPTIONS.lynx+=	slang
-.    endif
-.    if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses)
-PKG_OPTIONS.lynx+=	ncurses
-.    endif
-.    if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses)
-PKG_OPTIONS.lynx+=	curses
-.    endif
-.    if defined(USE_SOCKS) && (${USE_SOCKS} == 4)
-PKG_OPTIONS.lynx+=	socks4
-.    endif
-.    if defined(USE_SOCKS) && (${USE_SOCKS} == 5)
-PKG_OPTIONS.lynx+=	socks5
-.    endif
-.    if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_OPTIONS.lynx+=	inet6
-.    endif
-.  endif
+.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang)
+PKG_DEFAULT_OPTIONS+=	slang
+.endif
+.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses)
+PKG_DEFAULT_OPTIONS+=	ncurses
+.endif
+.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses)
+PKG_DEFAULT_OPTIONS+=	curses
+.endif
+.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	inet6
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
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"