diff options
| author | rillig <rillig@pkgsrc.org> | 2007-05-30 08:54:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-05-30 08:54:28 +0000 |
| commit | 7f125459d80717a6f65cde59fcdb87bf381dc2d8 (patch) | |
| tree | 9cb9969faf287080cd815dc0b06866755f0b1994 /x11 | |
| parent | 2b5e22ff4d29ce619700d81749ac6e868c997059 (diff) | |
| download | pkgsrc-7f125459d80717a6f65cde59fcdb87bf381dc2d8.tar.gz | |
Removed some code duplication from the buildlink3 files by using the new
pkg-build-options.mk procedure.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gtk2/buildlink3.mk | 11 | ||||
| -rw-r--r-- | x11/kdebase3/buildlink3.mk | 11 | ||||
| -rw-r--r-- | x11/kdelibs3/buildlink3.mk | 11 |
3 files changed, 9 insertions, 24 deletions
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index 8a5074024d5..3db26c87d0b 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.37 2007/05/25 21:53:00 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.38 2007/05/30 08:54:31 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+ @@ -26,13 +26,8 @@ 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!= \ - cd ${BUILDLINK_PKGSRCDIR.gtk2} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.gtk2=${PKG_BUILD_OPTIONS.gtk2:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.gtk2 +pkgbase := gtk2 +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) .include "../../x11/libXcursor/buildlink3.mk" diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index b33b9c00fc3..b21dabca971 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2007/01/17 23:47:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2007/05/30 08:54:31 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -17,13 +17,8 @@ BUILDLINK_ABI_DEPENDS.kdebase?= kdebase>=3.5.5nb1 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 .endif # KDEBASE_BUILDLINK3_MK -.if !defined(PKG_BUILD_OPTIONS.kdebase) -PKG_BUILD_OPTIONS.kdebase!= \ - cd ${BUILDLINK_PKGSRCDIR.kdebase} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.kdebase +pkgbase := kdebase +.include "../../mk/pkg-build-options.mk" BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0 diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 6c179325a3b..3430433511f 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2007/01/26 02:44:28 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:31 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+ @@ -19,13 +19,8 @@ BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs>=3.5.6 BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3 .endif # KDELIBS_BUILDLINK3_MK -.if !defined(PKG_BUILD_OPTIONS.kdelibs) -PKG_BUILD_OPTIONS.kdelibs!= \ - cd ${BUILDLINK_PKGSRCDIR.kdelibs} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.kdelibs=${PKG_BUILD_OPTIONS.kdelibs:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.kdelibs +pkgbase := kdelibs +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups) . include "../../print/cups/buildlink3.mk" |