diff options
| author | spz <spz> | 2010-10-13 00:11:21 +0000 |
|---|---|---|
| committer | spz <spz> | 2010-10-13 00:11:21 +0000 |
| commit | 3a49294c86b307294a715f2962713a87965db02b (patch) | |
| tree | dd9fd08511e74df3ccc228ea29c770ba70a0daec | |
| parent | d345ab688f4bbb994878e0d276b7fe4b22d60672 (diff) | |
| download | pkgsrc-3a49294c86b307294a715f2962713a87965db02b.tar.gz | |
make the package heed option -x11 again. If you don't specify that, the
package stays the same -> no revision bump.
| -rw-r--r-- | graphics/cairo/Makefile | 3 | ||||
| -rw-r--r-- | graphics/cairo/PLIST | 8 | ||||
| -rw-r--r-- | graphics/cairo/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/cairo/options.mk | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 7a8d38a10d2..97fbad379d2 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2010/09/15 12:02:27 wiz Exp $ +# $NetBSD: Makefile,v 1.85 2010/10/13 00:11:21 spz Exp $ DISTNAME= cairo-1.10.0 PKGREVISION= 1 @@ -41,7 +41,6 @@ TEST_TARGET= check .include "../../fonts/fontconfig/buildlink3.mk" BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" # include? #.include "../../print/libspectre/buildlink3.mk" diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 67104f9ccc7..9b496f7e103 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.26 2010/09/13 12:23:01 wiz Exp $ +@comment $NetBSD: PLIST,v 1.27 2010/10/13 00:11:21 spz Exp $ bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h -include/cairo/cairo-gl.h +${PLIST.x11}include/cairo/cairo-gl.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h ${PLIST.carbon}include/cairo/cairo-quartz.h @@ -20,8 +20,8 @@ lib/libcairo-script-interpreter.la lib/libcairo.la lib/pkgconfig/cairo-fc.pc lib/pkgconfig/cairo-ft.pc -lib/pkgconfig/cairo-gl.pc -lib/pkgconfig/cairo-glx.pc +${PLIST.x11}lib/pkgconfig/cairo-gl.pc +${PLIST.x11}lib/pkgconfig/cairo-glx.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc lib/pkgconfig/cairo-ps.pc diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 3282372cf46..dc1f3995e8c 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2010/09/14 11:00:47 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2010/10/13 00:11:21 spz Exp $ BUILDLINK_TREE+= cairo @@ -27,7 +27,11 @@ pkgbase := cairo .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" + +.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) .include "../../graphics/MesaLib/buildlink3.mk" +.endif + .include "../../graphics/png/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" .endif # CAIRO_BUILDLINK3_MK diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk index 46febf42735..d9b138cd1dc 100644 --- a/graphics/cairo/options.mk +++ b/graphics/cairo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2010/09/13 12:23:01 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2010/10/13 00:11:21 spz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cairo PKG_SUPPORTED_OPTIONS= x11 xcb @@ -29,5 +29,5 @@ PLIST.xcb= yes .endif .else -CONFIGURE_ARGS+= --disable-xlib --disable-xlib-xrender +CONFIGURE_ARGS+= --disable-xlib --disable-xlib-xrender --disable-gl .endif |