diff options
| -rw-r--r-- | devel/pilrc/Makefile | 5 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile | 4 | ||||
| -rw-r--r-- | lang/sun-jre15/Makefile | 4 | ||||
| -rw-r--r-- | mail/balsa2/options.mk | 4 | ||||
| -rw-r--r-- | net/net-snmp/options.mk | 4 | ||||
| -rw-r--r-- | security/tkpasman/options.mk | 5 | ||||
| -rw-r--r-- | www/mozilla/gecko-options.mk | 15 |
7 files changed, 7 insertions, 34 deletions
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index 3ce382cab65..c9971ebe68c 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -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_OPTIONS_VAR= PKG_OPTIONS.pilrc 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 --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index b9353fe1b10..395e369e148 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -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 @@ CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} 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 --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index b80aae5c630..032294c3321 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -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 @@ CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} 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 --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk index dd4aaeabaf9..b47ccdf9dae 100644 --- a/mail/balsa2/options.mk +++ b/mail/balsa2/options.mk @@ -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 --git a/net/net-snmp/options.mk b/net/net-snmp/options.mk index 388376f7235..687f59b5c31 100644 --- a/net/net-snmp/options.mk +++ b/net/net-snmp/options.mk @@ -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 --git a/security/tkpasman/options.mk b/security/tkpasman/options.mk index e295dbacc4d..3deaa764af4 100644 --- a/security/tkpasman/options.mk +++ b/security/tkpasman/options.mk @@ -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 --git a/www/mozilla/gecko-options.mk b/www/mozilla/gecko-options.mk index 1141b0fcfb4..483dce2d69f 100644 --- a/www/mozilla/gecko-options.mk +++ b/www/mozilla/gecko-options.mk @@ -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 |