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.

12 files changed, 150 insertions, 240 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 402b18ca1cb..12247c2270a 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/08/03 11:28:37 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/08/22 19:32:51 jlam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -56,13 +56,8 @@ CONF_FILES_PERMS+=	${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_}	\
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
-# Global and legacy options
-.if defined(USE_MILTER)
-.  if !defined(PKG_OPTIONS.clamav)
-.    if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
-PKG_OPTIONS.clamav+=	milter
-.    endif
-.  endif
+.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	milter
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 03e0b13adec..8cca2bf7e10 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/07/31 03:52:00 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2004/08/22 19:32:51 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.15
 PKGREVISION=		3
@@ -59,24 +59,11 @@ CONFIGURE_ARGS+=	--with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
 CONFIGURE_ENV+=		ac_cv_lib_${_var_}_db_create=no
 .endfor
 
-# Global and legacy options
-.if defined(CYRUS_USE_INET6) || defined(CYRUS_DB_RECOMMENDED) || \
-    defined(KERBEROS)
-.  if !defined(PKG_OPTIONS.cyrus-imapd)
-.    if defined(CYRUS_USE_INET6)
-PKG_OPTIONS.cyrus-imapd+=	inet6
-.    endif
-.    if defined(CYRUS_DB_RECOMMENDED)
-PKG_OPTIONS.cyrus-imapd+=	recommended-db
-.    endif
-.    if defined(KERBEROS)
-.      if ${KERBEROS} == "4"
-PKG_OPTIONS.cyrus-imapd+=	kerberos4
-.      else
-PKG_OPTIONS.cyrus-imapd+=	kerberos
-.      endif
-.    endif
-.  endif
+.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
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 76976f2aebf..3c85f140707 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/11 22:09:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:51 jlam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.8
 PKGREVISION=	1
@@ -49,18 +49,6 @@ CONFIGURE_ARGS+=	--enable-nntp
 CONFIGURE_ARGS+=	--without-zephyr
 CONFIGURE_ARGS+=	--without-ucdsnmp
 
-.if defined(KERBEROS)
-.  if !defined(PKG_OPTIONS.cyrus-imapd)
-.    if defined(KERBEROS)
-.      if ${KERBEROS} == "4"
-PKG_OPTIONS.cyrus-imapd+=	kerberos4
-.      else
-PKG_OPTIONS.cyrus-imapd+=	kerberos
-.      endif
-.    endif
-.  endif
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
 PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4
 .include "../../mk/bsd.options.mk"
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index 6f22de2fbb0..d44d89ea689 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,29 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2004/08/05 02:22:19 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:51 jlam Exp $
 
-# Global and legacy options
-.if defined(DOVECOT_USE_GNUTLS) || defined(DOVECOT_USE_MYSQL) || \
-    defined(DOVECOT_USE_PGSQL) || defined(USE_INET6) || \
-    defined(USE_OPENLDAP) || defined(USE_SASL2)
-.  if !defined(PKG_OPTIONS.dovecot)
-.    if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	gnutls
-.    endif
-.    if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	mysql
-.    endif
-.    if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	pgsql
-.    endif
-.    if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	inet6
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	ldap
-.    endif
-.    if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+=	sasl
-.    endif
-.  endif
+.if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	gnutls
+.endif
+.if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	pgsql
+.endif
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	inet6
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index e0364d20384..af3fa1658b4 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,42 +1,32 @@
-# $NetBSD: options.mk,v 1.2 2004/08/09 07:02:59 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
 
-# Global and legacy options
-.if defined(DSPAM_HOMEDIR_DOTFILES) || defined(DSPAM_USE_WEBMAIL) || \
-    defined(DSPAM_SIGNATURE_ATTACHMENTS) || \
-    defined(DSPAM_SIGNATURE_HEADERS) || defined(DSPAM_LARGESCALE) || \
-    defined(DSPAM_VIRTUAL_USERS) || defined(DSPAM_CGI_GRAPHS) || \
-    defined(DSPAM_CLIENT_COMPRESSION)
-.  if !defined(PKG_OPTIONS.dspam)
-.    if defined(DSPAM_HOMEDIR_DOTFILES) && \
-        !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	dotfiles
-.    endif
-.    if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	webmail
-.    endif
-.    if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
-        !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	sig-attachment
-.    endif
-.    if defined(DSPAM_SIGNATURE_HEADERS) && \
-        !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	sig-headers
-.    endif
-.    if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	largescale
-.    endif
-.    if defined(DSPAM_VIRTUAL_USERS) && \
-        !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	virtualusers
-.    endif
-.    if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	graphs
-.    endif
-.    if defined(DSPAM_CLIENT_COMPRESSION) && \
-        !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+=	compress
-.    endif
-.  endif
+.if defined(DSPAM_HOMEDIR_DOTFILES) && \
+    !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	dotfiles
+.endif
+.if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	webmail
+.endif
+.if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
+    !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	sig-attachment
+.endif
+.if defined(DSPAM_SIGNATURE_HEADERS) && \
+    !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	sig-headers
+.endif
+.if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	largescale
+.endif
+.if defined(DSPAM_VIRTUAL_USERS) && !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	virtualusers
+.endif
+.if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	graphs
+.endif
+.if defined(DSPAM_CLIENT_COMPRESSION) && \
+    !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	compress
 .endif
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index 1baee735cfb..94a9e6cd278 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/08/10 05:59:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $
 
 # Legacy options
 #
@@ -7,13 +7,11 @@
 # XXX
 # XXX	EZMLM_IDX_USE_MYSQL	EZMLM_IDX_USE_PGSQL
 #
-.if !defined(PKG_OPTIONS.ezmlm-idx)
-.  if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS])
-PKG_OPTIONS.ezmlm-idx+=	mysql
-.  endif
-.  if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
-PKG_OPTIONS.ezmlm-idx+=	pgsql
-.  endif
+.if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pgsql
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk
index 924c6f119a2..38173c72f00 100644
--- a/mail/fetchmail/options.mk
+++ b/mail/fetchmail/options.mk
@@ -1,23 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2004/08/05 03:30:16 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
 
-# Global and legacy options
-.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL)
-.  if !defined(PKG_OPTIONS.fetchmail)
-.    if defined(KERBEROS)
-PKG_OPTIONS.fetchmail+=	kerberos4
-.    endif
-.    if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_OPTIONS.fetchmail+=	inet6
-.    endif
-.    if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
-PKG_OPTIONS.fetchmail+=	ssl
-.    endif
-.  endif
+.if defined(KERBEROS)
+PKG_DEFAULT_OPTIONS+=	kerberos4
+.endif
+.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	inet6
+.endif
+.if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ssl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fetchmail
-PKG_OPTIONS.fetchmail?=	inet6 ssl
 PKG_SUPPORTED_OPTIONS=	inet6 kerberos4 ssl
+
+.if !defined(PKG_OPTIONS.fetchmail)
+PKG_DEFAULT_OPTIONS+=	inet6 ssl
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 5c63ad4c046..67901c15642 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,27 +1,26 @@
-# $NetBSD: options.mk,v 1.2 2004/08/05 03:30:16 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
 
 # Global and legacy options
-.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
-    defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
-.  if !defined(PKG_OPTIONS.mutt)
-.    if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	slang
-.    endif
-.    if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	ncurses
-.    endif
-.    if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	ssl
-.    endif
-.    if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	sasl
-.    endif
-.  endif
+.if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	slang
+.endif
+.if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ncurses
+.endif
+.if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ssl
+.endif
+.if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	sasl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
-PKG_OPTIONS.mutt?=	ssl
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
+
+.if !defined(PKG_OPTIONS.mutt)
+PKG_DEFAULT_OPTIONS+=	ssl
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index f0b073f8d58..3d5f7ebef1c 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,27 +1,26 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 07:19:25 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
 
 # Global and legacy options
-.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
-    defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
-.  if !defined(PKG_OPTIONS.mutt)
-.    if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	slang
-.    endif
-.    if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	ncurses
-.    endif
-.    if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	ssl
-.    endif
-.    if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
-PKG_OPTIONS.mutt+=	sasl
-.    endif
-.  endif
+.if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	slang
+.endif
+.if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ncurses
+.endif
+.if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ssl
+.endif
+.if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	sasl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
-PKG_OPTIONS.mutt?=	ssl
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
+
+.if !defined(PKG_OPTIONS.mutt)
+PKG_DEFAULT_OPTIONS+=	ssl
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index 34ac11c0556..b75d656f186 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/08/07 17:08:26 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:52 jlam Exp $
 
 # Global and legacy options
 #
@@ -10,43 +10,26 @@
 # XXX	POSTFIX_USE_PGSQL	POSTFIX_OPTIONS
 # XXX	POSTFIX_USE_SASL_AUTH
 #
-.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \
-    defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \
-    defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \
-    defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \
-    defined(POSTFIX_OPTIONS)
-.  if !defined(PKG_OPTIONS.postfix)
-.    if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	ldap
-.    endif
-.    if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	inet6
-.    endif
-.    if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	tls
-.    endif
-.    if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	pcre 
-.    endif
-.    if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	mysql
-.    endif
-.    if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	pgsql
-.    endif
-.    if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH)
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(POSTFIX_OPTIONS)
-PKG_OPTIONS.postfix=	${POSTFIX_OPTIONS}
-.    endif
-.  endif
+.if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	inet6
+.endif
+.if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	tls
+.endif
+.if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pcre 
+.endif
+.if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pgsql
+.endif
+.if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH)
+PKG_DEFAULT_OPTIONS+=	sasl
+.endif
+.if defined(POSTFIX_OPTIONS)
+PKG_DEFAULT_OPTIONS=	${POSTFIX_OPTIONS}
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postfix
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index 738f27fa444..ba5b2e0f8b3 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2004/08/11 06:51:31 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $
 
 # Global and legacy options
 #
@@ -10,43 +10,26 @@
 # XXX	POSTFIX_USE_PGSQL	POSTFIX_OPTIONS
 # XXX	POSTFIX_USE_SASL_AUTH
 #
-.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \
-    defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \
-    defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \
-    defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \
-    defined(POSTFIX_OPTIONS)
-.  if !defined(PKG_OPTIONS.postfix)
-.    if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	ldap
-.    endif
-.    if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	inet6
-.    endif
-.    if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	tls
-.    endif
-.    if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	pcre 
-.    endif
-.    if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	mysql
-.    endif
-.    if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS])
-PKG_OPTIONS.postfix+=	pgsql
-.    endif
-.    if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH)
-PKG_OPTIONS.postfix+=	sasl
-.    endif
-.    if defined(POSTFIX_OPTIONS)
-PKG_OPTIONS.postfix=	${POSTFIX_OPTIONS}
-.    endif
-.  endif
+.if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	inet6
+.endif
+.if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	tls
+.endif
+.if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pcre 
+.endif
+.if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pgsql
+.endif
+.if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH)
+PKG_DEFAULT_OPTIONS+=	sasl
+.endif
+.if defined(POSTFIX_OPTIONS)
+PKG_DEFAULT_OPTIONS=	${POSTFIX_OPTIONS}
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postfix
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index c5674a1bc22..b57285a5ff0 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,9 +1,11 @@
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
+
 .if ${OPSYS} == "Darwin"
-PKG_OPTIONS.qmail+=	darwin
+PKG_DEFAULT_OPTIONS+=	darwin
 .endif
 
 .if ${OPSYS} == "Linux"
-PKG_OPTIONS.qmail+=	netqmail	# for the errno patches
+PKG_DEFAULT_OPTIONS+=	netqmail	# for the errno patches
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail