From f091665c402aa28b24192f2c5a7a42958d3adead Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Fri, 28 May 2004 18:16:38 +0000
Subject: libgdk-x11 provided by this package directly uses libXft. So include
 buildlink for Xft2.

Also, the build which uses newer freetype includes
needs a newer Xft.h. So depend on Xft2>=2.1.2nb2.
(I didn't bump in the Xft2's buildlink3 because maybe
other packages don't need that new Xft.h.)
This will close PR #25548.
---
 x11/gtk2/Makefile      | 4 +++-
 x11/gtk2/buildlink3.mk | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'x11/gtk2')

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 995f359b08b..f07398fc033 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/05/19 12:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2004/05/28 18:16:38 reed Exp $
 #
 
 DISTNAME=		gtk+-2.4.1
@@ -15,6 +15,7 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		The GIMP Toolkit - libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
+BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
 
 USE_BUILDLINK3=		yes
 USE_DIRS+=		xdg-1.1
@@ -68,6 +69,7 @@ post-install:
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 95f1d340b7f..356e7b9bf8a 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/05/17 21:32:35 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/05/28 18:16:38 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -28,6 +28,7 @@ USE_X11= 	yes
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-- 
cgit v1.2.3