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.

8 files changed, 20 insertions, 34 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 7539647fb6b..1ccfbb0de98 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/31 10:01:39 dillo Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -40,12 +40,9 @@ MESSAGE_SUBST+=		PAM_MODULEDIR=${PAM_MODULEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	libcrack
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.PAM
 PKG_SUPPORTED_OPTIONS=	libcrack
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 6692c9b7484..7b37688c3ec 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/21 04:10:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/31 10:01:39 dillo Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -61,12 +61,9 @@ PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_D
 RCD_SCRIPTS=	amavisd
 CONF_FILES=	${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
 
-.if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss])
-PKG_DEFAULT_OPTIONS+=	milter
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amavisd-new
 PKG_SUPPORTED_OPTIONS=	milter
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmilter)
diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk
index be704f3978e..52be7c1d4d8 100644
--- a/security/courier-authlib/options.mk
+++ b/security/courier-authlib/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2005/03/18 20:20:48 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS=	PAM bdb ldap mysql pgsql
+PKG_SUGGESTED_OPTIONS=	bdb
 
-.if !defined(PKG_OPTIONS.courier-auth)
-PKG_DEFAULT_OPTIONS+=	bdb
-.endif
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index be89147052c..c6a9a6d0c37 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/31 10:01:39 dillo Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
 COMMENT=	Cyrus SASL SQL authentication plugin
@@ -8,10 +8,7 @@ SASL_PLUGIN=	yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cy2-sql
 PKG_SUPPORTED_OPTIONS=	mysql pgsql sqlite
-
-.if !defined(PKG_OPTIONS.cy2-sql)
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
+PKG_SUGGESTED_OPTIONS=	mysql
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 6f69dfd2a20..54f239e0c30 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/31 10:01:39 dillo Exp $
 
 DISTNAME=	heimdal-0.6.4
 CATEGORIES=	security
@@ -39,12 +39,10 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 USE_OLD_DES_API=	yes
 .include "../../security/openssl/buildlink3.mk"
 
-.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
 PKG_SUPPORTED_OPTIONS=	db4 ldap prefix-cmds
+PKG_OPTIONS_LEGACY_VARS+=	KERBEROS_PREFIX_CMDS:prefix-cmds
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdb4)
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 235aab5c644..8c5e1430953 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/10 12:39:28 manu Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:39 dillo Exp $
 #
 
 DISTNAME=		ipsec-tools-0.6b2
@@ -15,8 +15,8 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.ipsec-tools
-PKG_DEFAULT_OPTIONS+=	radius
-PKG_SUPPORTED_OPTIONS+=	radius
+PKG_SUPPORTED_OPTIONS=	radius
+PKG_SUGGESTED_OPTIONS=	radius
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index c695c91f5c7..65d6f45862d 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/31 10:01:39 dillo Exp $
 
 DISTNAME=	krb5-1.4
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -40,12 +40,10 @@ CONFIGURE_ARGS+=	--without-krb4
 CONFIGURE_ARGS+=	--without-tcl
 MAKE_ENV+=		ROOT_USER=${ROOT_USER}
 
-.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
 PKG_SUPPORTED_OPTIONS=	prefix-cmds
+PKG_OPTIONS_LEGACY_VARS+=	KERBEROS_PREFIX_CMDS:prefix-cmds
+
 .include "../../mk/bsd.options.mk"
 
 # Rename some of MIT krb5's applications so they won't conflict with
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index 19a032573f5..cbaa30571bb 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: options.mk,v 1.8 2005/05/31 10:01:39 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
 PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap skey
+
 .if ${OPSYS} == "NetBSD"
-PKG_DEFAULT_OPTIONS+=	skey
+PKG_SUGGESTED_OPTIONS=	skey
 .endif
 
 .include "../../mk/bsd.options.mk"