[pkgsrc/trunk]: pkgsrc/devel/pango remove conflicting Xft2 bl3 inclusion

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/332d35a7ebb4
branches:  trunk
changeset: 609752:332d35a7ebb4
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Oct 09 12:16:31 2012 +0000

description:
remove conflicting Xft2 bl3 inclusion

diffstat:

 devel/pango/Makefile      |  3 +--
 devel/pango/buildlink3.mk |  3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 96d397977c3a -r 332d35a7ebb4 devel/pango/Makefile
--- a/devel/pango/Makefile      Tue Oct 09 10:56:52 2012 +0000
+++ b/devel/pango/Makefile      Tue Oct 09 12:16:31 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2012/10/08 23:00:35 adam Exp $
+# $NetBSD: Makefile,v 1.170 2012/10/09 12:16:31 drochner Exp $
 
 DISTNAME=      pango-1.32.1
 PKGREVISION=   1
@@ -50,7 +50,6 @@
 PLIST.coretext=                yes
 .else
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
-.include "../../fonts/Xft2/buildlink3.mk"
 .endif
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.32.1
diff -r 96d397977c3a -r 332d35a7ebb4 devel/pango/buildlink3.mk
--- a/devel/pango/buildlink3.mk Tue Oct 09 10:56:52 2012 +0000
+++ b/devel/pango/buildlink3.mk Tue Oct 09 12:16:31 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2012/10/08 23:00:35 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2012/10/09 12:16:31 drochner Exp $
 
 BUILDLINK_TREE+=       pango
 
@@ -15,7 +15,6 @@
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.pango:Mx11)
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .endif