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.

9 files changed, 28 insertions, 84 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 9c14611446c..1caab4e0c34 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/08/05 02:42:12 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2004/08/22 19:32:52 jlam Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -38,13 +38,8 @@ MESSAGE_SUBST+=		PAM_MODULEDIR=${PAM_MODULEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-# Global and legacy options
-.if defined(USE_LIBCRACK)
-.  if !defined(PKG_OPTIONS.PAM)
-.    if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS])
-PKG_OPTIONS.PAM+=	libcrack
-.    endif
-.  endif
+.if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	libcrack
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.PAM
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 463dc881336..45728057eb5 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/22 19:32:52 jlam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -59,13 +59,8 @@ PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_D
 RCD_SCRIPTS=	amavisd
 CONF_FILES=	${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
 
-# Global and legacy options
-.if defined(USE_MILTER)
-.  if !defined(PKG_OPTIONS.amavisd-new)
-.    if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss])
-PKG_OPTIONS.amavisd-new+=	milter
-.    endif
-.  endif
+.if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss])
+PKG_DEFAULT_OPTIONS+=	milter
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amavisd-new
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index ac464dc9555..53c321b07da 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/08/13 07:11:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/22 19:32:52 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
 COMMENT=	Cyrus SASL SQL authentication plugin
@@ -7,8 +7,12 @@ SASL_PLUGIN=	yes
 .include "../cyrus-sasl2/Makefile.common"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cy2-sql
-PKG_OPTIONS.cy2-sql?=	mysql
 PKG_SUPPORTED_OPTIONS=	mysql pgsql sqlite
+
+.if !defined(PKG_OPTIONS.cy2-sql)
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 05df812292b..17415cc17b7 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/07/30 21:05:41 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/08/22 19:32:52 jlam Exp $
 
 .include "Makefile.common"
 
@@ -14,19 +14,8 @@ CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
 CONFIGURE_ARGS+=	--with-rc4=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
 
-# Global and legacy options
-.if defined(KERBEROS) || defined(USE_PAM) || defined(SASL_USE_GSSAPI)
-.  if !defined(PKG_OPTIONS.cyrus-sasl)
-.    if defined(KERBEROS)
-PKG_OPTIONS.cyrus-sasl+=	kerberos
-.    endif
-.    if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS])     
-PKG_OPTIONS.cyrus-sasl+=	PAM
-.    endif
-.    if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])     
-PKG_OPTIONS.cyrus-sasl+=	gssapi
-.    endif
-.  endif
+.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])     
+PKG_DEFAULT_OPTIONS+=	gssapi
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-sasl
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 85991bed451..8cd8d370760 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,22 +1,7 @@
-# $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(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \
-    defined(SASL_USE_GSSAPI)
-.  if !defined(PKG_OPTIONS.cyrus-saslauthd)
-.    if defined(KERBEROS)
-PKG_OPTIONS.cyrus-saslauthd+=	kerberos
-.    endif
-.    if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	PAM
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	ldap
-.    endif
-.    if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	gssapi
-.    endif
-.  endif
+.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	gssapi
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index df8f17255aa..812e5ebf222 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/05 16:28:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:52 jlam Exp $
 
 DISTNAME=	heimdal-0.6.1
 PKGREVISION=	1
@@ -37,16 +37,8 @@ LIBS.SunOS=		-ltermcap
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
 
-# Global and legacy options
-.if defined(USE_DB4) || defined(KERBEROS_PREFIX_CMDS)
-.  if !defined(PKG_OPTIONS.heimdal)
-.    if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS])     
-PKG_OPTIONS.heimdal+=	db4
-.    endif
-.    if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])     
-PKG_OPTIONS.heimdal+=	prefix-cmds
-.    endif
-.  endif
+.if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	prefix-cmds
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.heimdal
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index 14b8f91c400..15162f0acba 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/30 21:05:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/22 19:32:52 jlam Exp $
 
 DISTNAME=	krb5-1.3.4
 PKGNAME=	mit-${DISTNAME}
@@ -54,13 +54,8 @@ CONFIGURE_ARGS+=	--without-krb4
 CONFIGURE_ARGS+=	--without-tcl
 MAKE_ENV+=		ROOT_USER=${ROOT_USER}
 
-# Global and legacy options
-.if defined(KERBEROS_PREFIX_CMDS)
-.  if !defined(PKG_OPTIONS.mit-krb5)
-.    if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])
-PKG_OPTIONS.mit-krb5+=	prefix-cmds
-.    endif
-.  endif
+.if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	prefix-cmds
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mit-krb5
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 61293d0df62..9001267b879 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2004/08/05 02:45:28 jlam Exp $
+# $NetBSD: Makefile,v 1.95 2004/08/22 19:32:52 jlam Exp $
 
 DISTNAME=		openssl-0.9.6m
 SVR4_PKGNAME=		ossl
@@ -35,12 +35,8 @@ CONFIGURE_ARGS+=	shared
 CONFIGURE_ARGS+=	no-idea no-rc5 no-mdc2
 
 # Global and legacy options
-.if defined(USE_RSAREF2)
-.  if !defined(PKG_OPTIONS.openssl)
-.    if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
-PKG_OPTIONS.openssl+=	rsaref
-.    endif
-.  endif
+.if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	rsaref
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openssl
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index e66d4f85b10..2e0638ec933 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2004/07/30 21:05:42 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2004/08/22 19:32:52 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.7p5
@@ -32,13 +32,6 @@ CONFIGURE_ARGS+=	--with-skey
 CONFIGURE_ARGS+=	--without-skey
 .endif
 
-# Global and legacy options
-.if defined(KERBEROS)
-.  if !defined(PKG_OPTIONS.sudo)
-PKG_OPTIONS.sudo+=	kerberos
-.  endif
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
 PKG_SUPPORTED_OPTIONS=	kerberos
 .include "../../mk/bsd.options.mk"