diff options
| author | wiz <wiz@pkgsrc.org> | 2006-01-01 18:53:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-01-01 18:53:03 +0000 |
| commit | faf65456ad2318c11b72f18a1b9cbdba567320a4 (patch) | |
| tree | 5d640ac85fd8ec939edb585ae09bd6f4bce81c58 /mk | |
| parent | 220baa6b40fad15357118b4a1efb82993e9c389f (diff) | |
| download | pkgsrc-faf65456ad2318c11b72f18a1b9cbdba567320a4.tar.gz | |
Remove stuff that was marked for removal after 2005Q4.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/obsolete.mk | 24 | ||||
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 7 |
2 files changed, 2 insertions, 29 deletions
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 |