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

3 files changed, 20 insertions, 14 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index f93e60316dc..97c724411b4 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2014/05/28 02:35:56 pho Exp $
+# $NetBSD: Makefile,v 1.191 2014/06/27 00:41:47 schmonz Exp $
 
 DISTNAME=	pango-1.36.3
 PKGREVISION=	2
@@ -40,16 +40,8 @@ PKGCONFIG_OVERRIDE+=	pangoxft.pc.in
 CHECK_FILES_SKIP+=	${PREFIX}/libdata/pango/pango.modules
 CHECK_PORTABILITY_SKIP+= docs/check.docs
 
-PLIST_VARS+=		coretext
-
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-PLIST.coretext=		yes
-.endif
-
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index df671a2d22c..9dc45a5e0d9 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2014/06/02 06:56:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.62 2014/06/27 00:41:47 schmonz Exp $
 bin/pango-querymodules
 bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
@@ -28,7 +28,7 @@ include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
 include/pango-1.0/pango/pangocairo.h
-${PLIST.coretext}include/pango-1.0/pango/pangocoretext.h
+${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft.h
 include/pango-1.0/pango/pangofc-decoder.h
diff --git a/devel/pango/options.mk b/devel/pango/options.mk
index d9ad7819893..0d6e5314c1b 100644
--- a/devel/pango/options.mk
+++ b/devel/pango/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.12 2013/02/24 18:41:25 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2014/06/27 00:41:47 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pango
-PKG_SUPPORTED_OPTIONS=	x11 libthai
+PKG_SUPPORTED_OPTIONS=	libthai quartz x11
 PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		x11 thai
+PLIST_VARS+=		coretext quartz x11 thai
 
 ###
 ### X11 support
@@ -33,3 +33,17 @@ CONFIGURE_ARGS+=	--without-xft
 PLIST.thai=		yes
 .include "../../devel/libthai/buildlink3.mk"
 .endif
+
+.include "../../mk/bsd.prefs.mk"
+
+###
+### Quartz "support"
+###
+.if ${OPSYS} == "Darwin"
+### always looks for system CoreText
+PLIST.coretext=		yes
+. if !empty(PKG_OPTIONS:Mquartz)
+### installs its coretext header file if cairo was built with "quartz" option
+PLIST.quartz=		yes
+. endif
+.endif