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.

68 files changed, 192 insertions, 275 deletions

diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 23d01adba4e..408b323ac1f 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:24 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
 PKG_SUPPORTED_OPTIONS=	aac audiofile flac iconv id3 ogg
-PKG_DEFAULT_OPTIONS+=	aac audiofile flac iconv id3 ogg
+PKG_SUGGESTED_OPTIONS=	aac audiofile flac iconv id3 ogg
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 18bafc54a3b..a95a5341294 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2005/05/24 21:02:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.8 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
 PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap PAM
-PKG_DEFAULT_OPTIONS=	mysql
+PKG_SUGGESTED_OPTIONS=	mysql
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql)
diff --git a/chat/silc-client/options.mk b/chat/silc-client/options.mk
index 413b486971e..96a8b370cd3 100644
--- a/chat/silc-client/options.mk
+++ b/chat/silc-client/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:12:48 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-client
 PKG_SUPPORTED_OPTIONS=	debug inet6 perl
-PKG_DEFAULT_OPTIONS=	inet6 perl
+PKG_SUGGESTED_OPTIONS=	inet6 perl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/chat/silc-server/options.mk b/chat/silc-server/options.mk
index 5af335ff79d..9b7c6bc7b55 100644
--- a/chat/silc-server/options.mk
+++ b/chat/silc-server/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:09:43 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-server
 PKG_SUPPORTED_OPTIONS=	debug inet6
-PKG_DEFAULT_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/chat/xchat2/options.mk b/chat/xchat2/options.mk
index fed7b51ee33..2b5b07ba127 100644
--- a/chat/xchat2/options.mk
+++ b/chat/xchat2/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat2
 PKG_SUPPORTED_OPTIONS=	inet6 ssl socks
-
-.if !defined(PKG_OPTIONS.xchat2)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/databases/db4/options.mk b/databases/db4/options.mk
index 33d5d01682b..9c6b5656831 100644
--- a/databases/db4/options.mk
+++ b/databases/db4/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2004/12/27 04:27:49 jlam Exp $
-
-.if defined(WITH_JAVA) && !empty(WITH_JAVA:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	java
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.db4
 PKG_SUPPORTED_OPTIONS=	java
+PKG_OPTIONS_LEGACY_VARS+=	WITH_JAVA:java
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index 5c38a406ea9..4e3974e1408 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2005/02/09 15:38:03 cube Exp $
+# $NetBSD: options.mk,v 1.12 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS=	bdb dynamic kerberos sasl slp
-PKG_DEFAULT_OPTIONS+=	bdb
+PKG_SUGGESTED_OPTIONS=	bdb
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/devel/silc-toolkit/options.mk b/devel/silc-toolkit/options.mk
index a70e84f7411..e53725d2bfc 100644
--- a/devel/silc-toolkit/options.mk
+++ b/devel/silc-toolkit/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:45:24 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-toolkit
 PKG_SUPPORTED_OPTIONS=	debug inet6
-PKG_DEFAULT_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
index c2838164165..7a2d9ae3c16 100644
--- a/emulators/atari800/options.mk
+++ b/emulators/atari800/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/17 15:08:57 adam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
-PKG_DEFAULT_OPTIONS=	sdl
 PKG_SUPPORTED_OPTIONS=	sdl x11
+PKG_SUGGESTED_OPTIONS=	sdl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index dd104aab9c3..f6436211c4b 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/29 00:59:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/31 10:01:36 dillo Exp $
 #
 
 DISTNAME=	gxemul-0.3.2
@@ -27,11 +27,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.c ${PREFIX}/share/doc/${PKGBASE}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gxemul
-PKG_SUPPORTED_OPTIONS=	X11
-PKG_DEFAULT_OPTIONS?=	X11
+# X11 for legacy purposes.  can be removed after 2005Q2
+PKG_SUPPORTED_OPTIONS=	X11 x11
+PKG_SUGGESTED_OPTIONS=	x11
+
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MX11)
+.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:MX11)
 USE_X11=		yes
 GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SUBST_CLASSES=		x11
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 0bc063d49d2..69f4c68cb5d 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/31 10:01:36 dillo Exp $
 #
 
 DISTNAME=		vice-1.16
@@ -31,12 +31,9 @@ INFO_FILES=		vice.info
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ffmpeg
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=	esound ffmpeg gnome
+PKG_OPTIONS_LEGACY_VARS+=VICE_USE_FFMPEG:ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk
index 0e6bd5b2864..8f1c1a5729b 100644
--- a/games/scummvm/options.mk
+++ b/games/scummvm/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/03/31 09:52:26 adam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scummvm
-PKG_DEFAULT_OPTIONS=	sdl
 PKG_SUPPORTED_OPTIONS=	sdl x11
+PKG_SUGGESTED_OPTIONS=	sdl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 1dc35eb4800..87765944f7f 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2004/12/24 23:42:49 tv Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
-PKG_DEFAULT_OPTIONS=	x11
 PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index 8a083095abc..c38917a58b3 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2005/01/20 18:49:33 jmmv Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dia
 #PKG_SUPPORTED_OPTIONS=	gnome cairo
 PKG_SUPPORTED_OPTIONS=	gnome
-PKG_DEFAULT_OPTIONS=	gnome 
+PKG_SUGGESTED_OPTIONS=	gnome 
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 9b658e4b5d5..32bbece48e8 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=	freetype-2.1.9
 PKGNAME=	freetype2-2.1.9
@@ -30,11 +30,10 @@ PKGCONFIG_OVERRIDE=	builds/unix/freetype2.in
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-.if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	truetype
-.endif
 PKG_OPTIONS_VAR+=	PKG_OPTIONS.freetype2
 PKG_SUPPORTED_OPTIONS=	truetype
+PKG_OPTIONS_LEGACY_VARS+=	MKTTINTERP:truetype
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 053c9e6eaf2..efe46a56e9a 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=		magicpoint-1.10a
 PKGREVISION=		6
@@ -18,8 +18,8 @@ USE_IMAKE=		yes
 USE_PERL5=		build
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.magicpoint
-PKG_DEFAULT_OPTIONS+=	xft2
-PKG_SUPPORTED_OPTIONS+=	freetype vflib xft2
+PKG_SUPPORTED_OPTIONS=	freetype vflib xft2
+PKG_SUGGESTED_OPTIONS=	xft2
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/tiff/options.mk b/graphics/tiff/options.mk
index f56f430744a..67f09cfc3c7 100644
--- a/graphics/tiff/options.mk
+++ b/graphics/tiff/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2005/03/23 01:17:45 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tiff
 PKG_SUPPORTED_OPTIONS=	lzw
-PKG_DEFAULT_OPTIONS=	lzw
+PKG_SUGGESTED_OPTIONS=	lzw
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk
index ab57f078a14..a9e185c40d8 100644
--- a/lang/gauche/options.mk
+++ b/lang/gauche/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2005/03/07 03:16:46 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gauche
 PKG_SUPPORTED_OPTIONS=	gdbm multibyte
-PKG_DEFAULT_OPTIONS+=	gdbm multibyte
+PKG_SUGGESTED_OPTIONS=	gdbm multibyte
 
 .include "../../mk/bsd.options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 ###
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index e34a7a6dd6d..1aadffe1146 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/31 10:01:37 dillo Exp $
 #
 
 DISTNAME=	gawk-3.1.4
@@ -26,12 +26,9 @@ MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(GAWK_ENABLE_PORTALS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=   portals
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gawk
 PKG_SUPPORTED_OPTIONS=	portals
+PKG_OPTIONS_LEGACY_VARS+=	GAWK_ENABLE_PORTALS:portals
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index f7d6f1f7a5f..5b067968f08 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.5 2005/04/08 20:58:49 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.6 2005/05/31 10:01:37 dillo Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -32,25 +32,21 @@ CONFIGURE_ARGS+=	--enable-track-vars
 CONFIGURE_ARGS+=	--disable-posix
 CONFIGURE_ARGS+=	--disable-dom
 
-.if defined(USE_INET6) && ${USE_INET6} == "NO"
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 CONFIGURE_ARGS+=	--enable-xml
 CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
-# Global and legacy options
-.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"
 
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openssl
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"
 
diff --git a/math/octave-current/options.mk b/math/octave-current/options.mk
index 8dd829e1774..dbf9c5d297e 100644
--- a/math/octave-current/options.mk
+++ b/math/octave-current/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/04/01 10:15:19 adam Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
-PKG_DEFAULT_OPTIONS=	glpk hdf5
 PKG_SUPPORTED_OPTIONS=	glpk hdf5
+PKG_SUGGESTED_OPTIONS=	glpk hdf5
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/math/octave/options.mk b/math/octave/options.mk
index 2b56a221f83..ef58895dc69 100644
--- a/math/octave/options.mk
+++ b/math/octave/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/04/01 10:15:47 adam Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
-PKG_DEFAULT_OPTIONS=	hdf5
 PKG_SUPPORTED_OPTIONS=	hdf5
+PKG_SUGGESTED_OPTIONS=	hdf5
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 01719910d6f..ce9d9b241b2 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -10,9 +10,10 @@ USE_DIRS+=		xdg-1.1
 USE_PERL=		run
 USE_TOOLS+=		bison gawk
 
-PKG_DEFAULT_OPTIONS+=	sasl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kdepim
 PKG_SUPPORTED_OPTIONS=	sasl
+PKG_SUGGESTED_OPTIONS=	sasl
+
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index 0141e0bd17c..3d8eb9ef999 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.6 2005/05/08 13:43:31 dillo Exp $
+# $NetBSD: obsolete.mk,v 1.7 2005/05/31 10:01:40 dillo Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -38,14 +38,18 @@ PKG_OPTIONS_LEGACY_VARS+=	USE_ESOUND:esound
 PKG_OPTIONS_LEGACY_VARS+=	USE_GIF:gif
 PKG_OPTIONS_LEGACY_VARS+=	USE_I586:i586
 PKG_OPTIONS_LEGACY_VARS+=	USE_IDEA:idea
+PKG_OPTIONS_LEGACY_VARS+=	USE_INET6:inet6
 PKG_OPTIONS_LEGACY_VARS+=	USE_INN:inn
 PKG_OPTIONS_LEGACY_VARS+=	USE_LIBCRACK:libcrack
+PKG_OPTIONS_LEGACY_VARS+=	USE_MILTER:milter
 PKG_OPTIONS_LEGACY_VARS+=	USE_MMX:mmx
 PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap
 PKG_OPTIONS_LEGACY_VARS+=	USE_OSS:oss
+PKG_OPTIONS_LEGACY_VARS+=	USE_PAM:PAM
 PKG_OPTIONS_LEGACY_VARS+=	USE_RSAREF2:rsaref
 PKG_OPTIONS_LEGACY_VARS+=	USE_SASL:sasl
 PKG_OPTIONS_LEGACY_VARS+=	USE_SASL2:sasl
 PKG_OPTIONS_LEGACY_VARS+=	USE_SJ3:sj3
+PKG_OPTIONS_LEGACY_VARS+=	USE_SSL:ssl
 PKG_OPTIONS_LEGACY_VARS+=	USE_WNN4:wnn4
 PKG_OPTIONS_LEGACY_VARS+=	USE_XFACE:xface
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index b05ca93ee6b..41ab8af0de1 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/25 03:39:44 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	ffmpeg-0.4.8
 PKGREVISION=	3
@@ -31,10 +31,6 @@ PKG_SUPPORTED_OPTIONS=	bktr lame mmx vorbis
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_MMX:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=   mmx
-.endif
-
 .include "../../mk/compiler.mk"
 
 .if !empty(MACHINE_ARCH:Mi386)
diff --git a/net/arping/options.mk b/net/arping/options.mk
index 5fa613688a4..7ef4c0567d1 100644
--- a/net/arping/options.mk
+++ b/net/arping/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/02/01 18:24:34 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.arping
 PKG_SUPPORTED_OPTIONS=	arping1 arping2
-
-.if !defined(PKG_OPTIONS.arping)
-PKG_DEFAULT_OPTIONS+= 	arping1
-.endif
+PKG_SUGGESTED_OPTIONS= 	arping1
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index 343c1175d09..b28381981c8 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.3 2005/03/30 10:00:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:38 dillo Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
+PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2 tinydns64
 
 .if ${MACHINE_ARCH} == "sparc64" || \
 	${MACHINE_ARCH} == "alpha" || \
 	${MACHINE_ARCH} == "amd64"
-PKG_DEFAULT_OPTIONS+=   tinydns64
+PKG_SUGGESTED_OPTIONS=   tinydns64
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2 tinydns64
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index c42888ba06e..0e5b6ed64b4 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	flow-tools-0.67
 PKGREVISION=	2
@@ -27,17 +27,11 @@ SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
 .endfor
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
-.if defined(FLOW_TOOLS_USE_MYSQL) && \
-    !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
-.if defined(FLOW_TOOLS_USE_POSTGRESQL) && \
-    !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	postgresql
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.flow-tools
 PKG_SUPPORTED_OPTIONS=	mysql postgresql
+PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_MYSQL:mysql
+PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_POSTGRESQL:postgresql
+
 .include "../../mk/bsd.options.mk"
 
 # MySQL support.
diff --git a/net/libnids/options.mk b/net/libnids/options.mk
index b599f17fcb2..e645dd09548 100644
--- a/net/libnids/options.mk
+++ b/net/libnids/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/04/05 22:13:29 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libnids
 PKG_SUPPORTED_OPTIONS=	libnet10 libnet11
-
-.if !defined(PKG_OPTIONS.libnids)
-PKG_DEFAULT_OPTIONS+= 	libnet10
-.endif
+PKG_SUGGESTED_OPTIONS= 	libnet10
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/netbsd-tap/options.mk b/net/netbsd-tap/options.mk
index 9b14ab2c42f..021c7896cce 100644
--- a/net/netbsd-tap/options.mk
+++ b/net/netbsd-tap/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netbsd-tap
 PKG_SUPPORTED_OPTIONS=	bpf
-PKG_DEFAULT_OPTIONS?=	bpf
+PKG_SUGGESTED_OPTIONS=	bpf
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/samba2/options.mk b/net/samba2/options.mk
index a23560c3c17..3d8ebcb8081 100644
--- a/net/samba2/options.mk
+++ b/net/samba2/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:46 jlam Exp $
-
-# Global and legacy options
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap-compat
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba2
 PKG_SUPPORTED_OPTIONS=	PAM cups ldap-compat
+PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap-compat
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/net/wget/options.mk b/net/wget/options.mk
index 7fa47622382..0594a9eaa3f 100644
--- a/net/wget/options.mk
+++ b/net/wget/options.mk
@@ -1,17 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/02/09 17:51:47 tv Exp $
-
-# Global and legacy options
-.if defined(WGET_USE_SSL)
-BUILD_DEFS+=		WGET_USE_SSL
-.  if !empty(WGET_USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.  endif
-.else
-PKG_DEFAULT_OPTIONS+=	ssl # on by default
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+PKG_OPTIONS_LEGACY_VARS+=	WGET_USE_SSL:ssl
+
 .include "../../mk/bsd.options.mk"
 
 ###
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"
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index c03e5e1c191..b8d84da2c2a 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/31 10:01:39 dillo Exp $
 #
 
 DISTNAME=	bash-3.0
@@ -50,15 +50,11 @@ CONFIGURE_ARGS+=	--enable-array-variables
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	static
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bash
 PKG_SUPPORTED_OPTIONS=	multibyte static
-.if !defined(PKG_OPTIONS.bash)
-PKG_DEFAULT_OPTIONS+=	multibyte
-.endif
+PKG_SUGGESTED_OPTIONS=	multibyte
+PKG_OPTIONS_LEGACY_VARS+=	BASH_STATIC:static
+
 .include "../../mk/bsd.options.mk"
 
 ##
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 6cd8ac3381b..b5479e6ae6c 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.63 2005/05/31 10:01:39 dillo Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -31,16 +31,11 @@ PKG_SHELL=		${PREFIX}/bin/bash
 
 CFLAGS.Interix+=	-DUSE_POSIX_GLOB_LIBRARY
 
-# Global and legacy options
-.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	static
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bash
 PKG_SUPPORTED_OPTIONS=	multibyte static
-.if !defined(PKG_OPTIONS.bash)
-PKG_DEFAULT_OPTIONS+=	multibyte
-.endif
+PKG_SUGGESTED_OPTIONS=	multibyte
+PKG_OPTIONS_LEGACY_VARS+=	BASH_STATIC:static
+
 .include "../../mk/bsd.options.mk"
 
 ##
diff --git a/sysutils/bacula/Makefile.options b/sysutils/bacula/Makefile.options
index c7daa917e49..9e9a7a5f708 100644
--- a/sysutils/bacula/Makefile.options
+++ b/sysutils/bacula/Makefile.options
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.options,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+# $NetBSD: Makefile.options,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bacula
 PKG_SUPPORTED_OPTIONS=	catalog-sqlite catalog-pgsql
-PKG_DEFAULT_OPTIONS?=	catalog-sqlite
+PKG_SUGGESTED_OPTIONS=	catalog-sqlite
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 5abc47c179c..25688a9459c 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2005/05/17 19:11:47 jlam Exp $
+# $NetBSD: Makefile,v 1.166 2005/05/31 10:01:40 dillo 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).
@@ -64,15 +64,11 @@ BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
 CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}
 
-.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
 PKG_SUPPORTED_OPTIONS=	perf-tuning suexec
+PKG_OPTIONS_LEGACY_VARS+=	APACHE_PERF_TUNING:perf-tuning
+PKG_OPTIONS_LEGACY_VARS+=	APACHE_SUEXEC:suexec
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msuexec)
diff --git a/www/horde3/options.mk b/www/horde3/options.mk
index bd7264a1b2d..bce44429e29 100644
--- a/www/horde3/options.mk
+++ b/www/horde3/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2005/03/04 22:35:22 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:40 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.horde
 PKG_SUPPORTED_OPTIONS=	ldap postgresql mysql
+PKG_SUGGESTED_OPTIONS=	mysql
 
-.if !defined(PKG_OPTIONS.horde)
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index c215bcdf769..fb2338f0813 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2004/11/30 15:33:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 10:01:40 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	curses inet6 ncurses slang socks4 socks5
-PKG_DEFAULT_OPTIONS+=	curses
+PKG_SUGGESTED_OPTIONS=	curses
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 6f29bf45131..57a5fbbc02c 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:56 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:40 dillo Exp $
 
 DISTNAME=		HTML-Mason-1.28
 PKGNAME=		p5-${DISTNAME}
@@ -24,7 +24,7 @@ USE_PERL5=		run
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
 PKG_SUPPORTED_OPTIONS=	modperl
-PKG_DEFAULT_OPTIONS+=	modperl
+PKG_SUGGESTED_OPTIONS=	modperl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 915112ce99c..bdb6fd53676 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.21 2004/12/17 00:36:09 tron Exp $
+# $NetBSD: Makefile.php,v 1.22 2005/05/31 10:01:40 dillo Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -40,13 +40,9 @@ CONFIGURE_ARGS+=	${PHP4_CONFIGURE_ARGS}
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
-# Global and legacy options
-.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"
 
 .if !empty(PKG_OPTIONS:Mssl)
diff --git a/www/screws/options.mk b/www/screws/options.mk
index faabe4dd065..1d005334939 100644
--- a/www/screws/options.mk
+++ b/www/screws/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2005/03/20 17:52:20 jmmv Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:40 dillo Exp $
 #
 
-PKG_DEFAULT_OPTIONS+=	inet6 lua ssl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.screws
 PKG_SUPPORTED_OPTIONS=	inet6 lua ssl
+PKG_SUGGESTED_OPTIONS=	inet6 lua ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 38e0c2795ce..7eacd3bd8e5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/05/22 22:06:28 jlam Exp $
+# $NetBSD: Makefile,v 1.81 2005/05/31 10:01:40 dillo Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	3
@@ -73,9 +73,10 @@ CONFIGURE_ENV+=		RUN_KAPPFINDER=no
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-PKG_DEFAULT_OPTIONS+=	sasl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kdebase
 PKG_SUPPORTED_OPTIONS=	sasl samba
+PKG_SUGGESTED_OPTIONS=	sasl
+
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk
index bfa3b0303f6..70e6d56ccac 100644
--- a/x11/xorg-server/options.mk
+++ b/x11/xorg-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/03/22 14:01:20 adam Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:40 dillo Exp $
 
 _COMMONCARDDRIVERS=	apm ark ati chips cirrus cyrix dummy glint i128 mga \
 			neomagic nv rendition s3 s3virge savage siliconmotion \
@@ -22,7 +22,8 @@ _OSCARDDRIVERS+=	${_LINUXCARDDRIVERS}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xorg-server
 PKG_SUPPORTED_OPTIONS=	${_COMMONCARDDRIVERS} ${_OSCARDDRIVERS}
-PKG_DEFAULT_OPTIONS=	${PKG_SUPPORTED_OPTIONS}
+PKG_SUGGESTED_OPTIONS=	${PKG_SUPPORTED_OPTIONS}
+
 .include "../../mk/bsd.options.mk"
 
 .for _drv in ${PKG_OPTIONS}