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.

17 files changed, 48 insertions, 72 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index b379989da66..2a6cd54ea8c 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/23 22:41:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -54,14 +54,10 @@ CONF_FILES_PERMS+=	${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_}	\
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
-PKG_DEFAULT_OPTIONS+=	curl
-
-.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	milter
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	curl milter
+PKG_SUGGESTED_OPTIONS=	curl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmilter)
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 700e954e4ac..c4eb4bce9bc 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=	cue-snap-20050131
 PKGNAME=	cue-20050131
@@ -12,13 +12,10 @@ GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-# Global & legacy options
-.if defined(CUE_USE_CANNA) && !empty(CUE_USE_CANNA:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	canna
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cue
 PKG_SUPPORTED_OPTIONS=	canna idea inet6
+PKG_OPTIONS_LEGACY_VARS+=	CUE_USE_CANNA:canna
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6) && (${OPSYS} != "SunOS")
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 59c9235ac84..fc6387c5cd0 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/28 17:41:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 SVR4_PKGNAME=		cimap
@@ -56,15 +56,11 @@ CONFIGURE_ARGS+=	--with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
 CONFIGURE_ENV+=		ac_cv_lib_${_var_}_db_create=no
 .endfor
 
-.if defined(CYRUS_USE_INET6)
-PKG_DEFAULT_OPTIONS+=	inet6
-.endif
-.if defined(CYRUS_DB_RECOMMENDED)
-PKG_DEFAULT_OPTIONS+=	recommended-db
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
 PKG_SUPPORTED_OPTIONS=	gssapi inet6 kerberos kerberos4 recommended-db
+PKG_OPTIONS_LEGACY_VARS+=	CYRUS_USE_INET6:inet6
+PKG_OPTIONS_LEGACY_VARS+=	CYRUS_DB_RECOMMEND:recommend-db
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index 4ed39b12935..428ee126c8b 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/01/09 03:21:07 schmonz Exp $
-
-PKG_DEFAULT_OPTIONS+=   mysql
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
+PKG_SUGGESTED_OPTIONS=	mysql
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/ezmlm/options.mk b/mail/ezmlm/options.mk
index 77df65526be..ee14907bc5e 100644
--- a/mail/ezmlm/options.mk
+++ b/mail/ezmlm/options.mk
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2004/12/21 04:22:03 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm
+PKG_SUPPORTED_OPTIONS=	althash
 
 .if ${OPSYS} == "Darwin"
-PKG_DEFAULT_OPTIONS+=	althash
+PKG_SUGGESTED_OPTIONS=	althash
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm
-PKG_SUPPORTED_OPTIONS=	althash
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/gld/options.mk b/mail/gld/options.mk
index 1b4d65b3d14..50546b8f42c 100644
--- a/mail/gld/options.mk
+++ b/mail/gld/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/24 15:30:39 xtraeme Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:37 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gld
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
-PKG_DEFAULT_OPTIONS+=	mysql
+PKG_SUGGESTED_OPTIONS=	mysql
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 6c7fb1b180e..31af58855ba 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	maildrop-1.8.0
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -16,8 +16,8 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-PKG_SUPPORTED_OPTIONS+=	authlib
-PKG_DEFAULT_OPTIONS+=	authlib
+PKG_SUPPORTED_OPTIONS=	authlib
+PKG_SUGGESTED_OPTIONS=	authlib
 
 .include "../../mail/courier-maildir/Makefile.common"
 .include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index eb10cd9e0fb..e30da3747da 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2005/04/04 08:45:24 adam Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
-PKG_DEFAULT_OPTIONS=	ssl
 PKG_SUPPORTED_OPTIONS=	gnutls gsasl inet6 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 62b1e6a9ff1..a227ca6bbdc 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,13 +1,10 @@
-# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.5 2005/05/31 10:01:38 dillo Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
-
-.if !defined(PKG_OPTIONS.mutt)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index b227d3fd99c..9b22cdc1be7 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2005/03/28 08:57:58 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl buffy-size
-
-.if !defined(PKG_OPTIONS.mutt)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 554a06204e3..8625f7e60fc 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	Mail-ClamAV-0.13
 PKGNAME=	p5-${DISTNAME}
@@ -17,8 +17,8 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/ClamAV/.packlist
 PTHREAD_OPTS+=		require
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS+=	curl
-PKG_DEFAULT_OPTIONS+=	curl
+PKG_SUPPORTED_OPTIONS=	curl
+PKG_SUGGESTED_OPTIONS=	curl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index da28931d456..626dfe0cef0 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,12 +1,13 @@
-# $NetBSD: options.mk,v 1.12 2005/05/22 20:08:12 jlam Exp $
-
-.if ${OPSYS} == "Darwin"
-PKG_DEFAULT_OPTIONS+=	darwin
-.endif
+# $NetBSD: options.mk,v 1.13 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS=	badrcptto bigdns darwin netqmail outgoingip
 PKG_SUPPORTED_OPTIONS+=	qregex realrcptto sasl syncdir tls viruscan
+
+.if ${OPSYS} == "Darwin"
+PKG_SUGGESTED_OPTIONS=	darwin
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index 3e442c5ec1c..ec4686c4b9b 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/01/30 04:41:16 taca Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qpopper
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
-
-.if !defined(PKG_OPTIONS.qpopper)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index 98facd7a9ab..c12537474a2 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2005/03/28 09:39:57 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl starttls tcpwrappers \
 			socketmap
-
-.if !defined(PKG_OPTIONS.sendmail)
-PKG_DEFAULT_OPTIONS+=	tcpwrappers
-.endif
+PKG_SUGGESTED_OPTIONS=	tcpwrappers
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/ssmtp/options.mk b/mail/ssmtp/options.mk
index d221b4a841a..5800ad47ac1 100644
--- a/mail/ssmtp/options.mk
+++ b/mail/ssmtp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/03/08 09:33:19 adam Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ssmtp
-PKG_DEFAULT_OPTIONS=	ssl
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/teapop/options.mk b/mail/teapop/options.mk
index c306d679d8e..6f6bc1a4813 100644
--- a/mail/teapop/options.mk
+++ b/mail/teapop/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.teapop
 PKG_SUPPORTED_OPTIONS=	drac mysql apop vpop tcpd pgsql ldap inet6
-PKG_DEFAULT_OPTIONS+=	apop vpop tcpd
+PKG_SUGGESTED_OPTIONS=	apop vpop tcpd
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/turba/options.mk b/mail/turba/options.mk
index d26d7d78050..d618651cc1d 100644
--- a/mail/turba/options.mk
+++ b/mail/turba/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/03/25 13:21:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.turba
 PKG_SUPPORTED_OPTIONS=	ldap mysql
-
-.if !defined(PKG_OPTIONS.turba)
-PKG_DEFAULT_OPTIONS+=	ldap
-.endif
+PKG_SUGGESTED_OPTIONS=	ldap
 
 .include "../../mk/bsd.options.mk"