diff options
| author | joerg <joerg@pkgsrc.org> | 2007-05-25 18:02:45 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-05-25 18:02:45 +0000 |
| commit | 4114080503cd3bfc903bf85d3667d7c34cd47906 (patch) | |
| tree | 6916f60c8e398696e0ef33161d8546453272490f /x11 | |
| parent | 31f7ba18c8ca1fba0358cf9497c54e145137935b (diff) | |
| download | pkgsrc-4114080503cd3bfc903bf85d3667d7c34cd47906.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/gtk2/buildlink3.mk | 10 | ||||
| -rw-r--r-- | x11/gtk2/options.mk | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index 88892b412fc..dfb93729b0f 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -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 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules| .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 --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk index 015fdcd72cc..0b2b6e0bfe8 100644 --- a/x11/gtk2/options.mk +++ b/x11/gtk2/options.mk @@ -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 @@ PKG_OPTIONS_GROUP.gdk-target+= quartz .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) |