diff options
| author | drochner <drochner@pkgsrc.org> | 2012-10-09 12:16:31 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-10-09 12:16:31 +0000 |
| commit | 2baa97cc2a1fa430655e7059983acd9470abc738 (patch) | |
| tree | 05c3ba4a831d1223d01462e95375d6b76208e514 /devel/pango | |
| parent | 933a971ea0f9e101359d1ba6df73a421bd9a90bd (diff) | |
| download | pkgsrc-2baa97cc2a1fa430655e7059983acd9470abc738.tar.gz | |
remove conflicting Xft2 bl3 inclusion
Diffstat (limited to 'devel/pango')
| -rw-r--r-- | devel/pango/Makefile | 3 | ||||
| -rw-r--r-- | devel/pango/buildlink3.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 194826e89af..76176f194e6 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -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_VARS+= coretext 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 --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk index 46ae8541f76..306cd8ec7a1 100644 --- a/devel/pango/buildlink3.mk +++ b/devel/pango/buildlink3.mk @@ -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 @@ pkgbase := pango .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 |