Remove obsolete variables. You'll want to use:

PKG_OPTIONS.<pkg>+= foo blah

15 files changed, 16 insertions, 193 deletions

diff --git a/chat/xchat2/options.mk b/chat/xchat2/options.mk
index f245528ca0d..60d1e4d0424 100644
--- a/chat/xchat2/options.mk
+++ b/chat/xchat2/options.mk
@@ -1,15 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/10/30 18:28:00 minskim Exp $
-
-# Global and legacy options
-.if defined(USE_SOCKS) && !empty(USE_SOCKS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	socks
-.endif
-.if defined(XCHAT_USE_SSL) && !empty(XCHAT_USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	inet6
-.endif
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat2
 PKG_SUPPORTED_OPTIONS=	inet6 ssl socks
diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
index e0fc6e66979..fa505652aa7 100644
--- a/mail/balsa2/options.mk
+++ b/mail/balsa2/options.mk
@@ -1,10 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2004/11/14 17:02:03 jmmv Exp $
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
 #
 
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
-PKG_DEFAULT_OPTIONS+=	openldap
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa2
 PKG_SUPPORTED_OPTIONS=	openldap ssl
 
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index d44d89ea689..c62f1fff4e4 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,17 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:51 jlam Exp $
-
-.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
+# $NetBSD: options.mk,v 1.5 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS=	gnutls inet6 ldap mysql pgsql sasl
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index bc4c6cde039..284e2fdc405 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/10/29 07:07:44 xtraeme Exp $
-
-# Legacy options
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q3 branch is released:
-# XXX
-# XXX	EZMLM_IDX_USE_MYSQL	EZMLM_IDX_USE_PGSQL
-#
-.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
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk
index 38173c72f00..41a1914ca24 100644
--- a/mail/fetchmail/options.mk
+++ b/mail/fetchmail/options.mk
@@ -1,14 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
-
-.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
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fetchmail
 PKG_SUPPORTED_OPTIONS=	inet6 kerberos4 ssl
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index a758be96087..041da539663 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,20 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/09/19 13:02:55 wiz Exp $
-
-.if defined(MSMTP_USE_GNUTLS) && !empty(MSMTP_USE_GNUTLS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	gnutls
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	inet6
-.endif
-.if defined(MSMTP_USE_OPENSSL) && !empty(MSMTP_USE_OPENSSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-.if defined(MSMTP_USE_GSASL) && !empty(MSMTP_USE_GSASL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=   gsasl
-.endif
-.if defined(MSMTP_NO_SSL) && !empty(MSMTP_NO_SSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	nossl
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
 PKG_SUPPORTED_OPTIONS=	gnutls inet6 ssl gsasl nossl
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 67901c15642..62b1e6a9ff1 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,18 +1,6 @@
-# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
 
 # Global and legacy options
-.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_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index 13ede387b90..587d8cbf78f 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/09/12 04:33:12 jlam Exp $
-
-# Global and legacy options
-.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+=	sasl1
-.endif
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl1
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index 6a08a66db59..016372e031a 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,28 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/09/02 21:09:17 adrianp Exp $
-
-# Global and legacy options
-.if defined(USE_DB2) && !empty(USE_DB2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	db2
-.	elif defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	db4
-.endif
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap
-.endif
-.if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sasl
-.	elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sasl2
-.endif
-.if defined(USE_TCPWRAPPERS) && !empty(USE_TCPWRAPPERS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	tcpwrappers
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	inet6
-.endif
-.if defined(USE_STARTTLS) && !empty(USE_STARTTLS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	starttls
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl sasl2 starttls tcpwrappers \
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index 9dff19bbe87..c33cac785f7 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/10/12 00:11:10 heinz Exp $
-
-# Global and legacy options
-.if defined(SPAMASSASSIN_USE_SSL) && !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-.if defined(SPAMASSASSIN_RAZOR_TESTS) && !empty(SPAMASSASSIN_RAZOR_TESTS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	net-tests
-.endif
-.if defined(SPAMASSASSIN_PERL_WARNINGS) && !empty(SPAMASSASSIN_PERL_WARNINGS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	perl-warnings
-.endif
-.if defined(SPAMASSASSIN_PERL_TAINT_CHECKS) && !empty(SPAMASSASSIN_PERL_TAINT_CHECKS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	perl-taint-checks
-.endif
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS=	ssl net-tests perl-warnings perl-taint-checks \
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index 5372ceeecf5..daf29e7955b 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,3 +1,5 @@
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2
 .include "../../mk/bsd.options.mk"
diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk
index 317a577a98e..81eda6621b5 100644
--- a/net/pure-ftpd/options.mk
+++ b/net/pure-ftpd/options.mk
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $
-
-# Legacy options
-.if !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
-.if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	pgsql
-.endif
-.if !empty(PURE_FTPD_USE_TLS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-.if !empty(PURE_FTPD_USE_VIRTUAL_CHROOT:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	virtualchroot
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pureftpd
 PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql ssl virtualchroot
diff --git a/net/samba/options.mk b/net/samba/options.mk
index d816a69234e..b27199b7237 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,22 +1,6 @@
-# $NetBSD: options.mk,v 1.4 2004/11/06 11:07:17 jmmv Exp $
+# $NetBSD: options.mk,v 1.5 2004/11/17 19:56:49 xtraeme Exp $
 
 # Global and legacy options
-.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	cups
-.endif
-.if defined(USE_PAM)
-PKG_DEFAULT_OPTIONS+=	PAM
-.endif
-.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ads
-.endif
-.if defined(SAMBA_USE_LDAP)
-PKG_DEFAULT_OPTIONS+=	ldap
-.endif
-.if defined(SAMBA_USE_LDAP_COMPAT) && \
-    !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap-compat
-.endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba
 PKG_SUPPORTED_OPTIONS=	PAM ads cups ldap ldap-compat
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 8cd8d370760..77bc6f6f8e7 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,8 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
-
-.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	gssapi
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 2da1436b9f1..e9dfbd83479 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,17 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
-
-.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang)
-PKG_DEFAULT_OPTIONS+=	slang
-.endif
-.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses)
-PKG_DEFAULT_OPTIONS+=	ncurses
-.endif
-.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses)
-PKG_DEFAULT_OPTIONS+=	curses
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	inet6
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	curses inet6 ncurses slang socks4 socks5