Remove some legacy vars that were removed from pkgsrc before the previous branch.

3 files changed, 3 insertions, 18 deletions

diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index d7e2ef86f67..a5ad5123b6c 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.11 2005/06/06 13:54:51 dillo Exp $
+# $NetBSD: obsolete.mk,v 1.12 2005/08/01 11:37:38 wiz 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
@@ -34,24 +34,15 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAUL
 PKG_OPTIONS_LEGACY_VARS+=	USE_CANNA:canna
 PKG_OPTIONS_LEGACY_VARS+=	USE_CUPS:cups
 PKG_OPTIONS_LEGACY_VARS+=	USE_DB4:db4
-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
-
-PKG_OPTIONS_LEGACY_OPTS+=	PAM:pam
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 4b0d902aa36..ebc439df09d 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.7 2005/07/20 23:59:53 rillig Exp $
+# $NetBSD: deprecated.map,v 1.8 2005/08/01 11:37:46 wiz Exp $
 #
 
 # This file contains names of Makefile variables and a short explanation
@@ -26,14 +26,10 @@ USE_BUILDLINK3		You can just remove it.
 USE_CANNA		Use the PKG_OPTIONS framework instead.
 USE_CUPS		Use the PKG_OPTIONS framework instead.
 USE_DB4			Use the PKG_OPTIONS framework instead.
-USE_ESOUND		Use the PKG_OPTIONS framework instead.
-USE_GIF			Use the PKG_OPTIONS framework instead.
 USE_GMAKE		Use USE_TOOLS+=gmake instead.
 USE_GNU_TOOLS		Use USE_TOOLS instead.
 USE_I586		Use the PKG_OPTIONS framework instead.
 USE_IDEA		Use the PKG_OPTIONS framework instead.
-USE_LIBCRACK		Use the PKG_OPTIONS framework instead.
-USE_MMX			Use the PKG_OPTIONS framework instead.
 USE_OPENLDAP		Use the PKG_OPTIONS framework instead.
 USE_OSS			Use the PKG_OPTIONS framework instead.
 USE_RSAREF2		Use the PKG_OPTIONS framework instead.
@@ -44,7 +40,6 @@ USE_SOCKS		Use the PKG_OPTIONS framework instead.
 USE_WNN4		Use the PKG_OPTIONS framework instead.
 USE_XFACE		Use the PKG_OPTIONS framework instead.
 USE_PKGLIBTOOL		Use USE_LIBTOOL instead.
-USE_SSL			Include "../../security/openssl/buildlink3.mk" instead.
 
 # The following entries can be removed after the 2005Q4 branch.
 USE_PERL5		Use USE_TOOLS+=perl or USE_TOOLS+=perl:run instead.
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index aaba6533851..b3d686d585c 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.10 2005/08/01 10:55:42 wiz Exp $
+# $NetBSD: makevars.map,v 1.11 2005/08/01 11:37:46 wiz Exp $
 #
 
 # This file tries to guess the type of some variables, according to their
@@ -30,7 +30,6 @@ USE_CUPS		Yes_Or_Undefined
 USE_I586		Boolean
 USE_INET6		Boolean
 USE_INN			Yes_Or_Undefined
-USE_MMX			Boolean
 #USE_OPENLDAP		One_Of(YES NO)
 USE_OSS			Yes_Or_Undefined
 #USE_SASL		One_Of(YES NO)