[pkgsrc/trunk]: pkgsrc/mk/defaults Mark some PKG_OPTIONS_LEGACY_VARS for remo...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8656ce414c94
branches:  trunk
changeset: 503878:8656ce414c94
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 18:22:46 2005 +0000

description:
Mark some PKG_OPTIONS_LEGACY_VARS for removal after 2005Q4.

diffstat:

 mk/defaults/obsolete.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r c61dbc7662ee -r 8656ce414c94 mk/defaults/obsolete.mk
--- a/mk/defaults/obsolete.mk   Thu Dec 01 18:21:52 2005 +0000
+++ b/mk/defaults/obsolete.mk   Thu Dec 01 18:22:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.16 2005/10/03 21:25:17 wiz Exp $
+# $NetBSD: obsolete.mk,v 1.17 2005/12/01 18:22:46 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
@@ -36,15 +36,17 @@
 PKG_OPTIONS_LEGACY_OPTS+=      postgresql74:pgsql
 
 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_INET6:inet6
 PKG_OPTIONS_LEGACY_VARS+=      USE_INN:inn
 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
+
+# remove after 2005Q4
+PKG_OPTIONS_LEGACY_VARS+=      USE_CUPS:cups
+PKG_OPTIONS_LEGACY_VARS+=      USE_I586:i586
+PKG_OPTIONS_LEGACY_VARS+=      USE_SASL:sasl
+PKG_OPTIONS_LEGACY_VARS+=      USE_SASL2:sasl