Sun Feb 24 15:58:16 2013 UTC ()
On OS X 10.6.8, configure finds the native xft and builds against
it; judging by the PLIST, that's unintended. Tell configure to stop.


(schmonz)
diff -r1.176 -r1.177 pkgsrc/devel/pango/Makefile
cvs diff -r1.176 -r1.177 pkgsrc/devel/pango/Makefile (switch to unified diff)

--- pkgsrc/devel/pango/Makefile 2013/02/16 11:19:38 1.176
+++ pkgsrc/devel/pango/Makefile 2013/02/24 15:58:16 1.177
@@ -1,68 +1,69 @@ @@ -1,68 +1,69 @@
1# $NetBSD: Makefile,v 1.176 2013/02/16 11:19:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.177 2013/02/24 15:58:16 schmonz Exp $
2 2
3DISTNAME= pango-1.32.5 3DISTNAME= pango-1.32.5
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel fonts 5CATEGORIES= devel fonts
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.pango.org/ 10HOMEPAGE= http://www.pango.org/
11COMMENT= Library for layout and rendering of text 11COMMENT= Library for layout and rendering of text
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man 16BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man
17 17
18TEST_TARGET= check 18TEST_TARGET= check
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21USE_TOOLS+= gmake pkg-config 21USE_TOOLS+= gmake pkg-config
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 23CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
 24CONFIGURE_ARGS+= --without-xft
24# Carbon has been obsoleted; force turning it off 25# Carbon has been obsoleted; force turning it off
25#CONFIGURE_ENV+= ac_cv_header_Carbon_Carbon_h=no 26#CONFIGURE_ENV+= ac_cv_header_Carbon_Carbon_h=no
26 27
27PKGCONFIG_OVERRIDE= pango-uninstalled.pc.in 28PKGCONFIG_OVERRIDE= pango-uninstalled.pc.in
28PKGCONFIG_OVERRIDE+= pango.pc.in 29PKGCONFIG_OVERRIDE+= pango.pc.in
29PKGCONFIG_OVERRIDE+= pangocairo-uninstalled.pc.in 30PKGCONFIG_OVERRIDE+= pangocairo-uninstalled.pc.in
30PKGCONFIG_OVERRIDE+= pangocairo.pc.in 31PKGCONFIG_OVERRIDE+= pangocairo.pc.in
31PKGCONFIG_OVERRIDE+= pangoft2-uninstalled.pc.in 32PKGCONFIG_OVERRIDE+= pangoft2-uninstalled.pc.in
32PKGCONFIG_OVERRIDE+= pangoft2.pc.in 33PKGCONFIG_OVERRIDE+= pangoft2.pc.in
33PKGCONFIG_OVERRIDE+= pangowin32-uninstalled.pc.in 34PKGCONFIG_OVERRIDE+= pangowin32-uninstalled.pc.in
34PKGCONFIG_OVERRIDE+= pangowin32.pc.in 35PKGCONFIG_OVERRIDE+= pangowin32.pc.in
35PKGCONFIG_OVERRIDE+= pangox-uninstalled.pc.in 36PKGCONFIG_OVERRIDE+= pangox-uninstalled.pc.in
36PKGCONFIG_OVERRIDE+= pangox.pc.in 37PKGCONFIG_OVERRIDE+= pangox.pc.in
37PKGCONFIG_OVERRIDE+= pangoxft-uninstalled.pc.in 38PKGCONFIG_OVERRIDE+= pangoxft-uninstalled.pc.in
38PKGCONFIG_OVERRIDE+= pangoxft.pc.in 39PKGCONFIG_OVERRIDE+= pangoxft.pc.in
39 40
40CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules 41CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules
41CHECK_PORTABILITY_SKIP+= docs/check.docs 42CHECK_PORTABILITY_SKIP+= docs/check.docs
42 43
43PLIST_VARS+= coretext 44PLIST_VARS+= coretext
44 45
45.include "options.mk" 46.include "options.mk"
46 47
47.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
48 49
49.if ${OPSYS} == "Darwin" 50.if ${OPSYS} == "Darwin"
50PLIST.coretext= yes 51PLIST.coretext= yes
51.else 52.else
52BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 53BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3
53.endif 54.endif
54 55
55BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 56BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
56.include "../../devel/glib2/buildlink3.mk" 57.include "../../devel/glib2/buildlink3.mk"
57BUILDLINK_DEPMETHOD.gobject-introspection:= build 58BUILDLINK_DEPMETHOD.gobject-introspection:= build
58.include "../../devel/gobject-introspection/buildlink3.mk" 59.include "../../devel/gobject-introspection/buildlink3.mk"
59.include "../../devel/zlib/buildlink3.mk" 60.include "../../devel/zlib/buildlink3.mk"
60BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.5.0 61BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.5.0
61.include "../../fonts/fontconfig/buildlink3.mk" 62.include "../../fonts/fontconfig/buildlink3.mk"
62BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9 63BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9
63.include "../../fonts/harfbuzz/buildlink3.mk" 64.include "../../fonts/harfbuzz/buildlink3.mk"
64BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0 65BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
65.include "../../graphics/cairo/buildlink3.mk" 66.include "../../graphics/cairo/buildlink3.mk"
66.include "../../graphics/cairo-gobject/buildlink3.mk" 67.include "../../graphics/cairo-gobject/buildlink3.mk"
67.include "../../graphics/freetype2/buildlink3.mk" 68.include "../../graphics/freetype2/buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"