summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/sqlrelay/options.mk14
-rw-r--r--mail/imap-uw/options.mk6
-rw-r--r--mk/defaults/obsolete.mk24
-rw-r--r--mk/install/bsd.pkginstall.mk7
-rw-r--r--news/nntpcache/options.mk4
-rw-r--r--news/trn/options.mk4
-rw-r--r--pkgtools/pkglint/files/deprecated.map23
-rw-r--r--x11/xorg-server/options.mk7
8 files changed, 8 insertions, 81 deletions
diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk
index 64219605a50..7d78159b5ee 100644
--- a/databases/sqlrelay/options.mk
+++ b/databases/sqlrelay/options.mk
@@ -1,20 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2006/01/01 18:53:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sqlrelay
PKG_SUPPORTED_OPTIONS+= mysql pgsql
-# remove legacy handling after 2005Q4
-.if defined(SQLRELAY_DATABASES)
-.if !empty(SQLRELAY_DATABASES:Mmysql)
-PKG_LEGACY_OPTIONS+= mysql
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SQLRELAY_DATABASES used, use PKG_OPTIONS.sqlrelay+=mysql instead."
-.endif
-.if !empty(SQLRELAY_DATABASES:Mpostgresql)
-PKG_LEGACY_OPTIONS+= pgsql
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SQLRELAY_DATABASES used, use PKG_OPTIONS.sqlrelay+=pqsql instead."
-.endif
-.endif
-
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmysql)
diff --git a/mail/imap-uw/options.mk b/mail/imap-uw/options.mk
index 1c882dae79f..cde1fa53b86 100644
--- a/mail/imap-uw/options.mk
+++ b/mail/imap-uw/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/11/24 19:04:34 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/01 18:53:03 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -11,10 +11,6 @@ PKG_SUPPORTED_OPTIONS+= kerberos
PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw
PKG_SUPPORTED_OPTIONS+= inet6 ssl imapuw-cleartextpwd imapuw-whoson
PKG_SUGGESTED_OPTIONS+= ssl imapuw-cleartextpwd
-# remove after 2005q4
-PKG_OPTIONS_LEGACY_VARS+= IMAP_UW_NO_SSL:-ssl
-PKG_OPTIONS_LEGACY_VARS+= IMAP_UW_USE_WHOSON:imapuw-whoson
-PKG_OPTIONS_LEGACY_VARS+= IMAP_UW_NO_CLEARTEXT:-imapuw-cleartextpwd
.include "../../mk/bsd.options.mk"
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index 68cef3824ec..c299659a26f 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.25 2005/12/02 17:29:42 wiz Exp $
+# $NetBSD: obsolete.mk,v 1.26 2006/01/01 18:53:03 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
@@ -23,25 +23,3 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable KERBEROS used, use PKG_DEF
.endif
PKG_OPTIONS_LEGACY_VARS+= USE_INET6:inet6
-
-# remove everything below this line after 2005Q4
-.if defined(USE_SOCKS)
-. if ${USE_SOCKS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Msocks4)
-PKG_LEGACY_OPTIONS+= socks4
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead."
-. elif ${USE_SOCKS} == "5" && !empty(PKG_SUPPORTED_OPTIONS:Msocks5)
-PKG_LEGACY_OPTIONS+= socks5
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead."
-. endif
-.endif
-PKG_OPTIONS_LEGACY_VARS+= USE_CANNA:canna
-PKG_OPTIONS_LEGACY_VARS+= USE_CUPS:cups
-PKG_OPTIONS_LEGACY_VARS+= USE_I586:i586
-PKG_OPTIONS_LEGACY_VARS+= USE_OPENLDAP:ldap
-PKG_OPTIONS_LEGACY_VARS+= USE_OSS:oss
-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_WNN4:wnn4
-PKG_OPTIONS_LEGACY_VARS+= USE_XFACE:xface
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk
index b322375a143..fb4121ab558 100644
--- a/mk/install/bsd.pkginstall.mk
+++ b/mk/install/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.33 2005/12/29 14:10:01 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.34 2006/01/01 18:53:03 wiz Exp $
#
# This Makefile fragment is included by mk/install/pkginstall.mk and is
# the implemenation file for the common INSTALL/DEINSTALL scripts
@@ -119,11 +119,6 @@ _PKG_USER_SHELL?= ${NOLOGIN}
FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME:Q}
FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL:Q}
-# REMOVE: after 2005Q4
-.if !empty(PKG_USERS:M*\\\\*)
-PKG_FAIL_REASON+= "[bsd.pkginstall.mk] PKG_USERS must not contain double backslashes."
-.endif
-
# Interix is very special in that users are groups cannot have the
# same name. Interix.mk tries to work around this by overriding
# some specific package defaults. If we get here and there's still a
diff --git a/news/nntpcache/options.mk b/news/nntpcache/options.mk
index 396409fba43..0b06b7d0d58 100644
--- a/news/nntpcache/options.mk
+++ b/news/nntpcache/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/01 20:10:41 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/01 18:53:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nntpcache
PKG_SUPPORTED_OPTIONS= nntpcache-pgp
@@ -7,8 +7,6 @@ PKG_SUPPORTED_OPTIONS= nntpcache-pgp
# authinfo_ldap.c:81: error: dereferencing pointer to incomplete type
# authinfo_ldap.c:47: warning: unused variable `dom'
# PKG_SUPPORTED_OPTIONS+= openldap
-# remove after 2005Q4
-PKG_OPTIONS_LEGACY_VARS+= NNTP_USE_PGP:nntpcache-pgp
.include "../../mk/bsd.options.mk"
diff --git a/news/trn/options.mk b/news/trn/options.mk
index c2b990a7b6a..a2522a372ad 100644
--- a/news/trn/options.mk
+++ b/news/trn/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2005/12/01 19:45:11 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2006/01/01 18:53:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.trn
PKG_OPTIONS_REQUIRED_GROUPS= nntpclient
PKG_OPTIONS_GROUP.nntpclient= trn-inn trn-nntpclnt
PKG_SUGGESTED_OPTIONS+= trn-nntpclnt
-# remove after 2005Q4
-PKG_OPTIONS_LEGACY_VARS+= USE_INN:trn-inn
.include "../../mk/bsd.options.mk"
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index e28d4f88204..341701e7910 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,30 +1,9 @@
-# $NetBSD: deprecated.map,v 1.23 2005/12/02 17:09:12 wiz Exp $
+# $NetBSD: deprecated.map,v 1.24 2006/01/01 18:53:03 wiz Exp $
#
# This file contains names of Makefile variables and a short explanation
# what to do to make the warning disappear.
-# The following entries can be removed after the 2005Q3 branch.
-KERBEROS Use the PKG_OPTIONS framework instead.
-NO_CDROM Use NO_BIN_ON_CDROM and/or NO_SRC_ON_CDROM instead.
-NO_PACKAGE Don't use it to enforce license restrictions.
-USE_BUILDLINK3 You can just remove it.
-
-# The following entries can be removed after the 2005Q4 branch.
-USE_PERL5 Use USE_TOOLS+=perl or USE_TOOLS+=perl:run instead.
-USE_CUPS Use the PKG_OPTIONS framework (option cups) instead.
-USE_I586 Use the PKG_OPTIONS framework (option i586) instead.
-USE_INN Use the PKG_OPTIONS framework instead.
-USE_OPENLDAP Use the PKG_OPTIONS framework (option openldap) instead.
-USE_OSS Use the PKG_OPTIONS framework (option oss) instead.
-USE_RSAREF2 Use the PKG_OPTIONS framework (option rsaref) instead.
-USE_SASL Use the PKG_OPTIONS framework (option sasl) instead.
-USE_SASL2 Use the PKG_OPTIONS framework (option sasl) instead.
-USE_SJ3 Use the PKG_OPTIONS framework (option sj3) instead.
-USE_SOCKS Use the PKG_OPTIONS framework (socks4 and socks5 options) instead.
-USE_WNN4 Use the PKG_OPTIONS framework (option wnn4) instead.
-USE_XFACE Use the PKG_OPTIONS framework instead.
-
# The following entries can be removed after the 2006Q1 branch.
NO_TOOLS You can just remove it.
NO_WRAPPER You can just remove it.
diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk
index d60ad08c5aa..823a776f2b3 100644
--- a/x11/xorg-server/options.mk
+++ b/x11/xorg-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/12/02 17:51:50 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2006/01/01 18:53:03 wiz Exp $
_COMMONCARDDRIVERS= xorg-server-apm xorg-server-ark xorg-server-ati \
xorg-server-chips xorg-server-cirrus \
@@ -36,11 +36,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server
PKG_SUPPORTED_OPTIONS= ${_COMMONCARDDRIVERS} ${_OSCARDDRIVERS}
PKG_SUGGESTED_OPTIONS= ${PKG_SUPPORTED_OPTIONS}
-# remove legacy handling after 2005Q4
-.for _drv in ${_ALLCARDDRIVERS}
-PKG_OPTIONS_LEGACY_OPTS+= ${_drv:S/xorg-server-//}:${_drv}
-.endfor
-
.include "../../mk/bsd.options.mk"
.for _drv in ${PKG_OPTIONS}