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 /graphics | |
| 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 'graphics')
| -rw-r--r-- | graphics/aalib/buildlink3.mk | 11 | ||||
| -rw-r--r-- | graphics/cairo/buildlink3.mk | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk index 4b8a3338f4c..c73ec32fd38 100644 --- a/graphics/aalib/buildlink3.mk +++ b/graphics/aalib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/11/06 11:26:30 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:30 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+ @@ -17,13 +17,8 @@ BUILDLINK_ABI_DEPENDS.aalib+= aalib>=1.4.0.5nb2 BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib .endif # AALIB_BUILDLINK3_MK -.if !defined(PKG_BUILD_OPTIONS.aalib) -PKG_BUILD_OPTIONS.aalib!= \ - cd ${BUILDLINK_PKGSRCDIR.aalib} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.aalib=${PKG_BUILD_OPTIONS.aalib:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.aalib +pkgbase := aalib +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses) . include "../../devel/ncurses/buildlink3.mk" diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index a23cb2ebaef..907128057ad 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:30 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ @@ -21,13 +21,8 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 .include "../../mk/bsd.fast.prefs.mk" -.if !defined(PKG_BUILD_OPTIONS.cairo) -PKG_BUILD_OPTIONS.cairo!= \ - cd ${BUILDLINK_PKGSRCDIR.cairo} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.cairo=${PKG_BUILD_OPTIONS.cairo:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.cairo +pkgbase := cairo +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) .include "../../x11/libXrender/buildlink3.mk" |