Clean up freetype2 requirements so Xft2 and fontconfig also require the right

version via buildlink'ing

5 files changed, 12 insertions, 9 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 406532f310c..851e3e334e4 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/02/15 10:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 19:00:18 jmc Exp $
 #
 
 DISTNAME=		pango-1.2.1
@@ -11,8 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.pango.org
 COMMENT=		Library for layout and rendering of text
 
-BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.9
-
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index a09774efb14..5d8fa28ca19 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 19:00:19 jmc Exp $
 #
 
 DISTNAME=	fcpackage.2_1
@@ -14,7 +14,7 @@ COMMENT=	Library for configuring and customizing font access
 
 # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
 # sure to keep in step
-BUILDLINK_DEPENDS.freetype2?=  freetype2>=2.0.9
+BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
diff --git a/fonts/Xft2/buildlink2.mk b/fonts/Xft2/buildlink2.mk
index 5011bbb03a9..3742816556a 100644
--- a/fonts/Xft2/buildlink2.mk
+++ b/fonts/Xft2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/03/18 13:56:32 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/03/29 19:00:19 jmc Exp $
 #
 # This Makefile fragment is included by packages that use Xft2.
 #
@@ -18,6 +18,9 @@ BUILDLINK_FILES.Xft2+=	include/X11/Xft/*
 BUILDLINK_FILES.Xft2+=	lib/libXft.*
 BUILDLINK_FILES.Xft2+=	lib/pkgconfig/xft.pc
 
+# Make sure to include the right version of freetype2
+BUILDLINK_DEPENDS.freetype2=	freetype2>=2.0.9
+
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../x11/Xrender/buildlink2.mk"
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index ef44325804d..59288e1ee9d 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 19:00:19 jmc Exp $
 #
 
 DISTNAME=	fcpackage.2_1
@@ -14,7 +14,7 @@ COMMENT=	Library for configuring and customizing font access
 
 # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
 # sure to keep in step
-BUILDLINK_DEPENDS.freetype2?=  freetype2>=2.0.9
+BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/fonts/fontconfig/buildlink2.mk b/fonts/fontconfig/buildlink2.mk
index 428d523f0fb..184ca176905 100644
--- a/fonts/fontconfig/buildlink2.mk
+++ b/fonts/fontconfig/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/18 13:56:31 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/29 19:00:19 jmc Exp $
 #
 # This Makefile fragment is included by packages that use fontconfig.
 #
@@ -20,6 +20,8 @@ BUILDLINK_FILES.fontconfig+=	include/fontconfig/fontconfig.h
 BUILDLINK_FILES.fontconfig+=	lib/libfontconfig.*
 BUILDLINK_FILES.fontconfig+=	lib/pkgconfig/fontconfig.pc
 
+BUILDLINK_DEPENDS.freetype2=	freetype2>=2.0.9
+
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"