Fri Jun 27 00:41:47 2014 UTC ()
Fix installation on Darwin with the default PKG_OPTIONS.

Background: On systems with CoreText (i.e., Darwin), pango
unconditionally links with it and installs certain libraries; this
is already handled in PLIST.

Problem: On systems where cairo has been built with the "quartz"
option, pango installs an additional header file.

Fix: Given that the "quartz" option is off by default, and assuming
that users who enable it likely do so globally in PKG_DEFAULT_OPTIONS,
add a nominal "quartz" option to pango that conditionalizes whether
to expect this additional header file.

"Sounds good" from jperkin@.

Tested on:

* Mac OS X 10.9.3, with and without PKG_DEFAULT_OPTIONS+=quartz
  (from cairo on up the dependency chain)
* NetBSD/amd64 6.1.4, with X sets and the default options


(schmonz)
diff -r1.190 -r1.191 pkgsrc/devel/pango/Makefile
diff -r1.61 -r1.62 pkgsrc/devel/pango/PLIST
diff -r1.12 -r1.13 pkgsrc/devel/pango/options.mk
cvs diff -r1.190 -r1.191 pkgsrc/devel/pango/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pango/Makefile 2014/05/28 02:35:56 1.190
+++ pkgsrc/devel/pango/Makefile 2014/06/27 00:41:47 1.191
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.190 2014/05/28 02:35:56 pho Exp $ 1# $NetBSD: Makefile,v 1.191 2014/06/27 00:41:47 schmonz Exp $
2 2
3DISTNAME= pango-1.36.3 3DISTNAME= pango-1.36.3
4PKGREVISION= 2 4PKGREVISION= 2
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
@@ -30,36 +30,28 @@ PKGCONFIG_OVERRIDE+= pangocairo-uninstal @@ -30,36 +30,28 @@ PKGCONFIG_OVERRIDE+= pangocairo-uninstal
30PKGCONFIG_OVERRIDE+= pangocairo.pc.in 30PKGCONFIG_OVERRIDE+= pangocairo.pc.in
31PKGCONFIG_OVERRIDE+= pangoft2-uninstalled.pc.in 31PKGCONFIG_OVERRIDE+= pangoft2-uninstalled.pc.in
32PKGCONFIG_OVERRIDE+= pangoft2.pc.in 32PKGCONFIG_OVERRIDE+= pangoft2.pc.in
33PKGCONFIG_OVERRIDE+= pangowin32-uninstalled.pc.in 33PKGCONFIG_OVERRIDE+= pangowin32-uninstalled.pc.in
34PKGCONFIG_OVERRIDE+= pangowin32.pc.in 34PKGCONFIG_OVERRIDE+= pangowin32.pc.in
35PKGCONFIG_OVERRIDE+= pangox-uninstalled.pc.in 35PKGCONFIG_OVERRIDE+= pangox-uninstalled.pc.in
36PKGCONFIG_OVERRIDE+= pangox.pc.in 36PKGCONFIG_OVERRIDE+= pangox.pc.in
37PKGCONFIG_OVERRIDE+= pangoxft-uninstalled.pc.in 37PKGCONFIG_OVERRIDE+= pangoxft-uninstalled.pc.in
38PKGCONFIG_OVERRIDE+= pangoxft.pc.in 38PKGCONFIG_OVERRIDE+= pangoxft.pc.in
39 39
40CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules 40CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules
41CHECK_PORTABILITY_SKIP+= docs/check.docs 41CHECK_PORTABILITY_SKIP+= docs/check.docs
42 42
43PLIST_VARS+= coretext 
44 
45.include "options.mk" 43.include "options.mk"
46 44
47.include "../../mk/bsd.prefs.mk" 
48 
49.if ${OPSYS} == "Darwin" 
50PLIST.coretext= yes 
51.endif 
52 
53BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 45BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
54.include "../../devel/glib2/buildlink3.mk" 46.include "../../devel/glib2/buildlink3.mk"
55BUILDLINK_DEPMETHOD.gobject-introspection:= build 47BUILDLINK_DEPMETHOD.gobject-introspection:= build
56.include "../../devel/gobject-introspection/buildlink3.mk" 48.include "../../devel/gobject-introspection/buildlink3.mk"
57.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
58BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.10.91 50BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.10.91
59.include "../../fonts/fontconfig/buildlink3.mk" 51.include "../../fonts/fontconfig/buildlink3.mk"
60BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9 52BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9
61.include "../../fonts/harfbuzz/buildlink3.mk" 53.include "../../fonts/harfbuzz/buildlink3.mk"
62BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.10 54BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.10
63.include "../../graphics/cairo/buildlink3.mk" 55.include "../../graphics/cairo/buildlink3.mk"
64.include "../../graphics/cairo-gobject/buildlink3.mk" 56.include "../../graphics/cairo-gobject/buildlink3.mk"
65.include "../../graphics/freetype2/buildlink3.mk" 57.include "../../graphics/freetype2/buildlink3.mk"
cvs diff -r1.61 -r1.62 pkgsrc/devel/pango/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/pango/PLIST 2014/06/02 06:56:16 1.61
+++ pkgsrc/devel/pango/PLIST 2014/06/27 00:41:47 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.61 2014/06/02 06:56:16 adam Exp $ 1@comment $NetBSD: PLIST,v 1.62 2014/06/27 00:41:47 schmonz Exp $
2bin/pango-querymodules 2bin/pango-querymodules
3bin/pango-view 3bin/pango-view
4include/pango-1.0/pango/pango-attributes.h 4include/pango-1.0/pango/pango-attributes.h
5include/pango-1.0/pango/pango-bidi-type.h 5include/pango-1.0/pango/pango-bidi-type.h
6include/pango-1.0/pango/pango-break.h 6include/pango-1.0/pango/pango-break.h
7include/pango-1.0/pango/pango-context.h 7include/pango-1.0/pango/pango-context.h
8include/pango-1.0/pango/pango-coverage.h 8include/pango-1.0/pango/pango-coverage.h
9include/pango-1.0/pango/pango-engine.h 9include/pango-1.0/pango/pango-engine.h
10include/pango-1.0/pango/pango-enum-types.h 10include/pango-1.0/pango/pango-enum-types.h
11include/pango-1.0/pango/pango-features.h 11include/pango-1.0/pango/pango-features.h
12include/pango-1.0/pango/pango-font.h 12include/pango-1.0/pango/pango-font.h
13include/pango-1.0/pango/pango-fontmap.h 13include/pango-1.0/pango/pango-fontmap.h
14include/pango-1.0/pango/pango-fontset.h 14include/pango-1.0/pango/pango-fontset.h
@@ -18,27 +18,27 @@ include/pango-1.0/pango/pango-gravity.h @@ -18,27 +18,27 @@ include/pango-1.0/pango/pango-gravity.h
18include/pango-1.0/pango/pango-item.h 18include/pango-1.0/pango/pango-item.h
19include/pango-1.0/pango/pango-language.h 19include/pango-1.0/pango/pango-language.h
20include/pango-1.0/pango/pango-layout.h 20include/pango-1.0/pango/pango-layout.h
21include/pango-1.0/pango/pango-matrix.h 21include/pango-1.0/pango/pango-matrix.h
22include/pango-1.0/pango/pango-modules.h 22include/pango-1.0/pango/pango-modules.h
23include/pango-1.0/pango/pango-ot.h 23include/pango-1.0/pango/pango-ot.h
24include/pango-1.0/pango/pango-renderer.h 24include/pango-1.0/pango/pango-renderer.h
25include/pango-1.0/pango/pango-script.h 25include/pango-1.0/pango/pango-script.h
26include/pango-1.0/pango/pango-tabs.h 26include/pango-1.0/pango/pango-tabs.h
27include/pango-1.0/pango/pango-types.h 27include/pango-1.0/pango/pango-types.h
28include/pango-1.0/pango/pango-utils.h 28include/pango-1.0/pango/pango-utils.h
29include/pango-1.0/pango/pango.h 29include/pango-1.0/pango/pango.h
30include/pango-1.0/pango/pangocairo.h 30include/pango-1.0/pango/pangocairo.h
31${PLIST.coretext}include/pango-1.0/pango/pangocoretext.h 31${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h
32${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h 32${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
33${PLIST.x11}include/pango-1.0/pango/pangoxft.h 33${PLIST.x11}include/pango-1.0/pango/pangoxft.h
34include/pango-1.0/pango/pangofc-decoder.h 34include/pango-1.0/pango/pangofc-decoder.h
35include/pango-1.0/pango/pangofc-font.h 35include/pango-1.0/pango/pangofc-font.h
36include/pango-1.0/pango/pangofc-fontmap.h 36include/pango-1.0/pango/pangofc-fontmap.h
37include/pango-1.0/pango/pangoft2.h 37include/pango-1.0/pango/pangoft2.h
38lib/girepository-1.0/Pango-1.0.typelib 38lib/girepository-1.0/Pango-1.0.typelib
39lib/girepository-1.0/PangoCairo-1.0.typelib 39lib/girepository-1.0/PangoCairo-1.0.typelib
40${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib 40${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
41lib/girepository-1.0/PangoFT2-1.0.typelib 41lib/girepository-1.0/PangoFT2-1.0.typelib
42lib/libpango-1.0.la 42lib/libpango-1.0.la
43lib/libpangocairo-1.0.la 43lib/libpangocairo-1.0.la
44lib/libpangoft2-1.0.la 44lib/libpangoft2-1.0.la
cvs diff -r1.12 -r1.13 pkgsrc/devel/pango/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/pango/options.mk 2013/02/24 18:41:25 1.12
+++ pkgsrc/devel/pango/options.mk 2014/06/27 00:41:47 1.13
@@ -1,35 +1,49 @@ @@ -1,35 +1,49 @@
1# $NetBSD: options.mk,v 1.12 2013/02/24 18:41:25 wiz Exp $ 1# $NetBSD: options.mk,v 1.13 2014/06/27 00:41:47 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pango 3PKG_OPTIONS_VAR= PKG_OPTIONS.pango
4PKG_SUPPORTED_OPTIONS= x11 libthai 4PKG_SUPPORTED_OPTIONS= libthai quartz x11
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= x11
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= x11 thai 9PLIST_VARS+= coretext quartz x11 thai
10 10
11### 11###
12### X11 support 12### X11 support
13### 13###
14.if !empty(PKG_OPTIONS:Mx11) 14.if !empty(PKG_OPTIONS:Mx11)
15# fix for pangox.pc 15# fix for pangox.pc
16CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib 16CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib
17PLIST.x11= yes 17PLIST.x11= yes
18BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 18BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3
19.include "../../x11/libXft/buildlink3.mk" 19.include "../../x11/libXft/buildlink3.mk"
20.include "../../x11/libXrender/buildlink3.mk" 20.include "../../x11/libXrender/buildlink3.mk"
21.include "../../x11/libX11/buildlink3.mk" 21.include "../../x11/libX11/buildlink3.mk"
22BUILDLINK_DEPMETHOD.libXt?= build # only for configure 22BUILDLINK_DEPMETHOD.libXt?= build # only for configure
23.include "../../x11/libXt/buildlink3.mk" 23.include "../../x11/libXt/buildlink3.mk"
24.else 24.else
25CONFIGURE_ARGS+= --without-x 25CONFIGURE_ARGS+= --without-x
26CONFIGURE_ARGS+= --without-xft 26CONFIGURE_ARGS+= --without-xft
27.endif 27.endif
28 28
29### 29###
30### Thai language support 30### Thai language support
31### 31###
32.if !empty(PKG_OPTIONS:Mlibthai) 32.if !empty(PKG_OPTIONS:Mlibthai)
33PLIST.thai= yes 33PLIST.thai= yes
34.include "../../devel/libthai/buildlink3.mk" 34.include "../../devel/libthai/buildlink3.mk"
35.endif 35.endif
 36
 37.include "../../mk/bsd.prefs.mk"
 38
 39###
 40### Quartz "support"
 41###
 42.if ${OPSYS} == "Darwin"
 43### always looks for system CoreText
 44PLIST.coretext= yes
 45. if !empty(PKG_OPTIONS:Mquartz)
 46### installs its coretext header file if cairo was built with "quartz" option
 47PLIST.quartz= yes
 48. endif
 49.endif