Fri Oct 17 13:00:44 2008 UTC ()
Set API depends here as well. This fixes the build on system with a
builtin "pixman" older than 0.12.0 (e.g. NetBSD-current or Mac OS X).


(tron)
diff -r1.29 -r1.30 pkgsrc/graphics/cairo/buildlink3.mk

cvs diff -r1.29 -r1.30 pkgsrc/graphics/cairo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/buildlink3.mk 2008/10/06 16:23:09 1.29
+++ pkgsrc/graphics/cairo/buildlink3.mk 2008/10/17 13:00:44 1.30
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.29 2008/10/06 16:23:09 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.30 2008/10/17 13:00:44 tron Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ 4CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= cairo 7BUILDLINK_DEPENDS+= cairo
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo}
11BUILDLINK_PACKAGES+= cairo 11BUILDLINK_PACKAGES+= cairo
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo
13 13
14.if ${CAIRO_BUILDLINK3_MK} == "+" 14.if ${CAIRO_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
16BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.6.4 16BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.6.4
17BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo 17BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
18 18
19BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 19BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
 20BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1
 21BUILDLINK_API_DEPENDS.pixman+= pixman>=0.12.0
20.endif # CAIRO_BUILDLINK3_MK 22.endif # CAIRO_BUILDLINK3_MK
21 23
22.include "../../mk/bsd.fast.prefs.mk" 24.include "../../mk/bsd.fast.prefs.mk"
23 25
24pkgbase := cairo 26pkgbase := cairo
25.include "../../mk/pkg-build-options.mk" 27.include "../../mk/pkg-build-options.mk"
26 28
27.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) 29.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
28.include "../../x11/libXrender/buildlink3.mk" 30.include "../../x11/libXrender/buildlink3.mk"
29.endif 31.endif
30 32
31.include "../../fonts/fontconfig/buildlink3.mk" 33.include "../../fonts/fontconfig/buildlink3.mk"
32.include "../../graphics/freetype2/buildlink3.mk" 34.include "../../graphics/freetype2/buildlink3.mk"