[pkgsrc/trunk]: pkgsrc Get rid of some more stuff that was to be removed afte...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/49ee7f7917d6
branches:  trunk
changeset: 500208:49ee7f7917d6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Oct 03 21:36:58 2005 +0000

description:
Get rid of some more stuff that was to be removed after 2005Q3.

diffstat:

 devel/pilrc/Makefile         |   5 +----
 lang/sun-jre14/Makefile      |   4 +---
 lang/sun-jre15/Makefile      |   4 +---
 mail/balsa2/options.mk       |   4 +---
 net/net-snmp/options.mk      |   4 +---
 security/tkpasman/options.mk |   5 +----
 www/mozilla/gecko-options.mk |  15 +--------------
 7 files changed, 7 insertions(+), 34 deletions(-)

diffs (124 lines):

diff -r 7864f54e29ef -r 49ee7f7917d6 devel/pilrc/Makefile
--- a/devel/pilrc/Makefile      Mon Oct 03 21:25:17 2005 +0000
+++ b/devel/pilrc/Makefile      Mon Oct 03 21:36:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/26 10:22:47 dillo Exp $
+# $NetBSD: Makefile,v 1.28 2005/10/03 21:36:58 wiz Exp $
 #
 
 DISTNAME=      pilrc-3.2
@@ -21,9 +21,6 @@
 PKG_SUPPORTED_OPTIONS=         gtk
 PKG_SUGGESTED_OPTIONS=         gtk
 
-# PILRC_USE_GTK should be removed after the pkgsrc-2005Q3 branch.
-PKG_OPTIONS_LEGACY_VARS+=      PILRC_USE_GTK:gtk
-
 .include "../../mk/bsd.options.mk"
 
 ###
diff -r 7864f54e29ef -r 49ee7f7917d6 lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile   Mon Oct 03 21:25:17 2005 +0000
+++ b/lang/sun-jre14/Makefile   Mon Oct 03 21:36:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/09/17 16:44:54 dillo Exp $
+# $NetBSD: Makefile,v 1.30 2005/10/03 21:36:59 wiz Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -36,8 +36,6 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre14
 PKG_SUPPORTED_OPTIONS= sun-jre-jce
-# can be removed after 2005Q3
-PKG_OPTIONS_LEGACY_VARS=SUN_JRE14_USE_JCE:sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
diff -r 7864f54e29ef -r 49ee7f7917d6 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Mon Oct 03 21:25:17 2005 +0000
+++ b/lang/sun-jre15/Makefile   Mon Oct 03 21:36:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/20 19:16:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/10/03 21:36:58 wiz Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -29,8 +29,6 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre15
 PKG_SUPPORTED_OPTIONS= sun-jre-jce
-# can be removed after 2005Q3
-PKG_OPTIONS_LEGACY_VARS=SUN_JRE15_USE_JCE:sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
diff -r 7864f54e29ef -r 49ee7f7917d6 mail/balsa2/options.mk
--- a/mail/balsa2/options.mk    Mon Oct 03 21:25:17 2005 +0000
+++ b/mail/balsa2/options.mk    Mon Oct 03 21:36:58 2005 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/07/28 14:58:36 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/10/03 21:36:59 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.balsa2
 PKG_SUPPORTED_OPTIONS= ldap ssl
-# remove after 2005Q3
-PKG_OPTIONS_LEGACY_OPTS+= openldap:ldap
 
 .include "../../mk/bsd.options.mk"
 
diff -r 7864f54e29ef -r 49ee7f7917d6 net/net-snmp/options.mk
--- a/net/net-snmp/options.mk   Mon Oct 03 21:25:17 2005 +0000
+++ b/net/net-snmp/options.mk   Mon Oct 03 21:36:58 2005 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2005/08/01 11:58:33 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/10/03 21:36:59 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.net-snmp
 PKG_SUPPORTED_OPTIONS=         ssl
-# remove after pkgsrc-2005Q3
-PKG_OPTIONS_LEGACY_VARS+=      NET_SNMP_USE_SSL:ssl
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 7864f54e29ef -r 49ee7f7917d6 security/tkpasman/options.mk
--- a/security/tkpasman/options.mk      Mon Oct 03 21:25:17 2005 +0000
+++ b/security/tkpasman/options.mk      Mon Oct 03 21:36:58 2005 +0000
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2005/08/01 11:45:56 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/10/03 21:36:59 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.tkpasman
 PKG_SUPPORTED_OPTIONS=         ssl
 PKG_SUGGESTED_OPTIONS=         ssl
 
-# remove after pkgsrc-2005Q3
-PKG_OPTIONS_LEGACY_VARS+=      TKPASMAN_USE_SSL:ssl
-
 .include "../../mk/bsd.options.mk"
 
 # SSL support
diff -r 7864f54e29ef -r 49ee7f7917d6 www/mozilla/gecko-options.mk
--- a/www/mozilla/gecko-options.mk      Mon Oct 03 21:25:17 2005 +0000
+++ b/www/mozilla/gecko-options.mk      Mon Oct 03 21:36:58 2005 +0000
@@ -1,18 +1,5 @@
-# $NetBSD: gecko-options.mk,v 1.2 2005/09/28 12:04:29 rillig Exp $
+# $NetBSD: gecko-options.mk,v 1.3 2005/10/03 21:36:59 wiz Exp $
 
 PKG_OPTIONS_REQUIRED_GROUPS+=  gecko
 PKG_OPTIONS_GROUP.gecko=       firefox mozilla
 PKG_SUGGESTED_OPTIONS+=                firefox
-
-.include "../../mk/bsd.prefs.mk"
-
-# can be removed after 2005Q3
-.if defined(GECKO_PROVIDER)
-.  if ${GECKO_PROVIDER} == "firefox"
-PKG_LEGACY_OPTIONS+=firefox
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable GECKO_PROVIDER used, use PKG_DEFAULT_OPTIONS+=firefox instead."
-.  else
-PKG_LEGACY_OPTIONS+=mozilla
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable GECKO_PROVIDER used, use PKG_DEFAULT_OPTIONS+=mozilla instead."
-.  endif
-.endif