From 4fb0965f6f32c061ee4138e3ca0a99ebd6271d26 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 6 Nov 2006 11:24:26 +0000
Subject: Switch to modular buildlinks.

---
 devel/pango/buildlink3.mk |  6 +++---
 devel/pango/options.mk    | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'devel/pango')

diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 57d66df3eaf..2f9224e99cb 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/23 04:59:34 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/11/06 11:24:26 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -28,8 +28,8 @@ MAKEFLAGS+=	PKG_BUILD_OPTIONS.pango=${PKG_BUILD_OPTIONS.pango:Q}
 MAKEVARS+=	PKG_BUILD_OPTIONS.pango
 
 .if !empty(PKG_BUILD_OPTIONS.pango:Mx11)
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/pango/options.mk b/devel/pango/options.mk
index f505795dc25..f446422d6af 100644
--- a/devel/pango/options.mk
+++ b/devel/pango/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/07/24 23:20:50 minskim Exp $
+# $NetBSD: options.mk,v 1.3 2006/11/06 11:24:26 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS=	x11
@@ -15,10 +15,11 @@ PKG_SUGGESTED_OPTIONS=	x11
 CONFIGURE_ENV+=	ac_cv_lib_cairo_cairo_atsui_font_face_create_for_atsu_font_id=no
 PLIST_SUBST+=		CARBON="@comment "
 PLIST_SUBST+=		X11=""
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build # only for configure
+.include "../../x11/libXt/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUBST+=		X11="@comment "
-- 
cgit v1.2.3