Remove some more *LEGACY* settings that are over a month old and

thus were before 2005Q3.

9 files changed, 11 insertions, 29 deletions

diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index b478a0924cb..4af82d9fdc6 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/10/05 13:29:50 wiz Exp $
 
 DISTNAME=	cue-snap-20050131
 PKGNAME=	cue-20050131
@@ -14,7 +14,6 @@ GNU_CONFIGURE=	yes
 
 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"
 
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 4cb83486893..491b24dd0fa 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/08/08 16:50:59 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/10/05 13:29:50 wiz Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 SVR4_PKGNAME=		cimap
@@ -59,8 +59,6 @@ CONFIGURE_ENV+=		ac_cv_lib_${_var_}_db_create=no
 
 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"
 
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index 6caa8ddd18b..1f12053fdd0 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 14:45:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/10/05 13:29:49 wiz Exp $
 
 DISTNAME=	deliver-2.1.14
 PKGREVISION=	1
@@ -13,7 +13,6 @@ PKG_SYSCONFSUBDIR=		deliver
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.deliver
 PKG_SUPPORTED_OPTIONS=		deliver-suid
-PKG_OPTIONS_LEGACY_VARS+=	DELIVER_SUID:deliver-suid
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 37e5592c365..7b08b2ad480 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2005/08/24 10:59:12 adrianp Exp $
+# $NetBSD: Makefile,v 1.91 2005/10/05 13:29:50 wiz Exp $
 
 DISTNAME=		evolution-2.2.3
 PKGREVISION=		1
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	YES
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution
 PKG_SUPPORTED_OPTIONS=	inet6 krb4 krb5 ssl
-PKG_OPTIONS_LEGACY_OPTS+=	ipv6:inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index cc8da4dfa2d..10fb9c65cb0 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2005/10/02 20:26:24 minskim Exp $
+# $NetBSD: Makefile,v 1.101 2005/10/05 13:29:51 wiz Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -42,18 +42,15 @@ BUILD_TARGET=	osf
 .else
 BUILD_TARGET=	neb
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.imap-uw
+PKG_SUPPORTED_OPTIONS+=	inet6
 # Kerberos is explicitly not enabled on NetBSD 1.x due to interoperability
 # issues with later versions of OpenSSL (e.g. 0.9.7)
 .  if empty(MACHINE_PLATFORM:MNetBSD-1.*)
 PKG_SUPPORTED_OPTIONS+=		kerberos
-
-PKG_OPTIONS_LEGACY_VARS+=	USE_KERBEROS:kerberos
 .  endif
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.imap-uw
-PKG_SUPPORTED_OPTIONS+=	inet6
-
 .include "../../mk/bsd.options.mk"
 
 .if empty(PKG_OPTIONS:Minet6)
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 2bb299eeccf..62e7c2805d4 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/05 13:29:50 wiz Exp $
 #
 
 DISTNAME=	mail-notification-1.0
@@ -26,7 +26,6 @@ CONF_FILES=	${EGDIR}/sound/events/mail-notification.soundlist \
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mail-notification
 PKG_SUPPORTED_OPTIONS=	inet6 sasl ssl
-PKG_OPTIONS_LEGACY_OPTS+=	ipv6:inet6
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
diff --git a/mail/nmh/options.mk b/mail/nmh/options.mk
index 1d379ad1090..9a39eb5b8a8 100644
--- a/mail/nmh/options.mk
+++ b/mail/nmh/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2005/09/22 22:00:42 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:51 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nmh
 PKG_SUPPORTED_OPTIONS=		nmh-backup-hash
-PKG_OPTIONS_LEGACY_VARS+=	NMH_HASH_BACKUP:nmh-backup-hash
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index d1e41596fe4..a93072db004 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.10 2005/08/01 15:27:00 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2005/10/05 13:29:50 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap
 PKG_SUGGESTED_OPTIONS=	tcpwrappers
 
-PKG_OPTIONS_LEGACY_OPTS+=	starttls:tls
-PKG_OPTIONS_LEGACY_OPTS+=	socketmap:sendmail-socketmap
-
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk
index def9295581c..3cb6ea45035 100644
--- a/mail/sendmail812/options.mk
+++ b/mail/sendmail812/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/08/01 15:27:00 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
@@ -6,11 +6,6 @@ PKG_OPTIONS_GROUP.database=	db2 db4
 PKG_SUPPORTED_OPTIONS=	inet6 ldap sasl tls tcpwrappers sendmail-socketmap
 PKG_SUGGESTED_OPTIONS=	tcpwrappers
 
-PKG_OPTIONS_LEGACY_OPTS+=	starttls:tls
-PKG_OPTIONS_LEGACY_OPTS+=	socketmap:sendmail-socketmap
-PKG_OPTIONS_LEGACY_VARS+=	USE_STARTTLS:ssl
-PKG_OPTIONS_LEGACY_VARS+=	USE_TCPWRAPPERS:tcpwrappers
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"