Add explicit dependencies on the pkgsrc versions of Xft2/Xrender to avoid

problems.
Also remove superfluous buildlink2.mk and bump PKGREVISION to 1.

3 files changed, 18 insertions, 36 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index ea11d9d0a81..fe84304269d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/02/23 14:09:01 recht Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/29 00:06:14 recht Exp $
 #
 
 DISTNAME=	cairo-0.1.17
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
@@ -16,10 +17,14 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	cairo.pc.in
 GNU_CONFIGURE=		yes
 
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.1.5
-.include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
+BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
+BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libpixman/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo/buildlink2.mk b/graphics/cairo/buildlink2.mk
deleted file mode 100644
index b654a1bc6fd..00000000000
--- a/graphics/cairo/buildlink2.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/02/03 12:16:43 recht Exp $
-#
-
-.if !defined(CAIRO_BUILDLINK2_MK)
-CAIRO_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			cairo
-BUILDLINK_DEPENDS.cairo?=		cairo>=0.1.17
-BUILDLINK_PKGSRCDIR.cairo?=		../../graphics/cairo
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.cairo=cairo
-BUILDLINK_PREFIX.cairo_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.cairo+=	include/cairo-features.h
-BUILDLINK_FILES.cairo+=	include/cairo.h
-BUILDLINK_FILES.cairo+=	lib/libcairo.*
-
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.1.5
-
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/libpixman/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	cairo-buildlink
-
-cairo-buildlink: _BUILDLINK_USE
-
-.endif	# CAIRO_BUILDLINK2_MK
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 8033e179e9a..6fe3795c09f 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/29 00:06:14 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -9,14 +9,18 @@ BUILDLINK_DEPENDS+=	cairo
 
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		cairo
-BUILDLINK_DEPENDS.cairo+=	cairo>=0.1.17
+BUILDLINK_DEPENDS.cairo+=	cairo>=0.1.17nb1
 BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 
-BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.5
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
+BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
+BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libpixman/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
 
-.  include "../../fonts/Xft2/buildlink3.mk"
-.  include "../../graphics/freetype2/buildlink3.mk"
-.  include "../../graphics/libpixman/buildlink3.mk"
 .endif # CAIRO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}