diff options
| author | jlam <jlam> | 2005-05-09 05:14:08 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-09 05:14:08 +0000 |
| commit | 65b6231d93a04d007dfbf44ad07728c7117be375 (patch) | |
| tree | 7af5a426569840b8254a0dcc5e86c83cd71ad1ca /x11 | |
| parent | c34608ae916ed78ce7d48d4642faf538caec14e2 (diff) | |
| download | pkgsrc-65b6231d93a04d007dfbf44ad07728c7117be375.tar.gz | |
Don't assign to PKG_OPTIONS.<pkg> which has special meaning to the
options framework. Rename PKG_OPTIONS.* to PKG_BUILD_OPTIONS.*.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdebase3/buildlink3.mk | 14 | ||||
| -rw-r--r-- | x11/kdelibs3/buildlink3.mk | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index ba9c13c5266..4cd280abf11 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2005/05/09 05:06:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:14:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -16,13 +16,13 @@ BUILDLINK_RECOMMENDED.kdebase?= kdebase>=3.4.0 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 .endif # KDEBASE_BUILDLINK3_MK -.if !defined(PKG_OPTIONS.kdebase) -PKG_OPTIONS.kdebase!= \ +.if !defined(PKG_BUILD_OPTIONS.kdebase) +PKG_BUILD_OPTIONS.kdebase!= \ cd ${BUILDLINK_PKGSRCDIR.kdebase} && \ ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS -MAKE_FLAGS+= PKG_OPTIONS.kdebase=${PKG_OPTIONS.kdebase:Q} +MAKE_FLAGS+= PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q} .endif -MAKE_VARS+= PKG_OPTIONS.kdebase +MAKE_VARS+= PKG_BUILD_OPTIONS.kdebase BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 @@ -30,10 +30,10 @@ BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" -.if !empty(PKG_OPTIONS.kdebase:Msamba) +.if !empty(PKG_BUILD_OPTIONS.kdebase:Msamba) . include "../../net/samba/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS.kdebase:Msasl) +.if !empty(PKG_BUILD_OPTIONS.kdebase:Msasl) . include "../../security/cyrus-sasl2/buildlink3.mk" .endif .include "../../x11/Xrandr/buildlink3.mk" diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 90cb329686c..edcc2892fca 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:06:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2005/05/09 05:14:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+ @@ -20,15 +20,15 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3 .include "../../x11/kdelibs3/dirs.mk" .endif # KDELIBS_BUILDLINK3_MK -.if !defined(PKG_OPTIONS.kdelibs) -PKG_OPTIONS.kdelibs!= \ +.if !defined(PKG_BUILD_OPTIONS.kdelibs) +PKG_BUILD_OPTIONS.kdelibs!= \ cd ${BUILDLINK_PKGSRCDIR.kdelibs} && \ ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS -MAKE_FLAGS+= PKG_OPTIONS.kdelibs=${PKG_OPTIONS.kdelibs:Q} +MAKE_FLAGS+= PKG_BUILD_OPTIONS.kdelibs=${PKG_BUILD_OPTIONS.kdelibs:Q} .endif -MAKE_VARS+= PKG_OPTIONS.kdelibs +MAKE_VARS+= PKG_BUILD_OPTIONS.kdelibs -.if !empty(PKG_OPTIONS.kdelibs:Mcups) +.if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups) . include "../../print/cups/buildlink3.mk" .endif .include "../../archivers/bzip2/buildlink3.mk" |