[pkgsrc/trunk]: pkgsrc/x11/gtk2 Remove old spelling of PKG_OPTION.gtk2+, it i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad29cb4ebb14
branches:  trunk
changeset: 529128:ad29cb4ebb14
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 25 18:02:45 2007 +0000

description:
Remove old spelling of PKG_OPTION.gtk2+, it is after 2007Q1.
Fix spelling of the PKG_BUILD_OPTION.gtk2+ variable for the same
reason.

diffstat:

 x11/gtk2/buildlink3.mk |  10 +++++-----
 x11/gtk2/options.mk    |   8 +-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diffs (49 lines):

diff -r 531d45da12da -r ad29cb4ebb14 x11/gtk2/buildlink3.mk
--- a/x11/gtk2/buildlink3.mk    Fri May 25 15:12:52 2007 +0000
+++ b/x11/gtk2/buildlink3.mk    Fri May 25 18:02:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2006/12/12 21:52:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2007/05/25 18:02:45 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=   ${GTK2_BUILDLINK3_MK}+
@@ -26,13 +26,13 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !defined(PKG_BUILD_OPTIONS.gtk2+)
-PKG_BUILD_OPTIONS.gtk2+!= \
+.if !defined(PKG_BUILD_OPTIONS.gtk2)
+PKG_BUILD_OPTIONS.gtk2!= \
        cd ${BUILDLINK_PKGSRCDIR.gtk2} && \
        ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+=    PKG_BUILD_OPTIONS.gtk2+=${PKG_BUILD_OPTIONS.gtk2+:Q}
+MAKEFLAGS+=    PKG_BUILD_OPTIONS.gtk2=${PKG_BUILD_OPTIONS.gtk2+:Q}
 .endif
-MAKEVARS+=     PKG_BUILD_OPTIONS.gtk2+
+MAKEVARS+=     PKG_BUILD_OPTIONS.gtk2
 
 .if !empty(PKG_BUILD_OPTIONS.gtk2+:Mx11)
 .include "../../x11/libXcursor/buildlink3.mk"
diff -r 531d45da12da -r ad29cb4ebb14 x11/gtk2/options.mk
--- a/x11/gtk2/options.mk       Fri May 25 15:12:52 2007 +0000
+++ b/x11/gtk2/options.mk       Fri May 25 18:02:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/01/29 21:24:13 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2007/05/25 18:02:45 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk2
 PKG_SUPPORTED_OPTIONS= cups debug
@@ -9,12 +9,6 @@
 .endif
 PKG_SUGGESTED_OPTIONS=         x11
 
-# remove after pkgsrc-2007Q1
-.if defined(PKG_OPTIONS.gtk2+)
-PKG_LEGACY_OPTIONS+=   ${PKG_OPTIONS.gtk2+}
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.gtk2+ used, use "${PKG_OPTIONS_VAR:Q}" instead."
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)