Resurrect Quartz backend as package option "quartz" which is disabled by default

4 files changed, 36 insertions, 17 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index b119bc88bea..a3fb0a2be11 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2014/05/27 08:43:55 pho Exp $
+# $NetBSD: Makefile,v 1.135 2014/05/31 10:16:40 pho Exp $
 
 .include "../../graphics/cairo/Makefile.common"
 
-PKGREVISION=			3
+PKGREVISION=			4
 
 TEST_TARGET=			check
 
diff --git a/graphics/cairo/Makefile.common b/graphics/cairo/Makefile.common
index 5fad358a0bf..7a2c7957764 100644
--- a/graphics/cairo/Makefile.common
+++ b/graphics/cairo/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2014/05/30 11:56:32 joerg Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/05/31 10:16:40 pho Exp $
 #
 # used by graphics/cairo/Makefile
 # used by graphics/cairo-gobject/Makefile
@@ -29,17 +29,6 @@ CONFIGURE_ARGS+=	--enable-pdf
 CONFIGURE_ARGS+=	--enable-ps
 CONFIGURE_ARGS+=	--enable-tee
 
-# Darwin: Quartz backend interacts badly with our library stack. The
-# most notable issue is that when quartz-font is enabled, cairo will
-# never use fontconfig but instead uses CoreGraphics API to find fonts
-# in system-default font paths; as a result, any fonts installed with
-# pkgsrc will never be found. OTOH fontconfig by default searches for
-# fonts in MacOS X system-default paths too so sticking with it will
-# not cause a problem.
-CONFIGURE_ARGS+=	--disable-quartz
-CONFIGURE_ARGS+=	--disable-quartz-font
-CONFIGURE_ARGS+=	--disable-quartz-image
-
 PKGCONFIG_OVERRIDE+=	src/cairo.pc.in
 PKGCONFIG_OVERRIDE+=	src/cairo-features.pc.in
 
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 33d91584078..bad6737c5ab 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.35 2014/05/27 08:43:55 pho Exp $
+@comment $NetBSD: PLIST,v 1.36 2014/05/31 10:16:40 pho Exp $
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
+${PLIST.quartz}include/cairo/cairo-quartz-image.h
+${PLIST.quartz}include/cairo/cairo-quartz.h
 include/cairo/cairo-script-interpreter.h
 include/cairo/cairo-script.h
 include/cairo/cairo-svg.h
@@ -26,6 +28,9 @@ lib/pkgconfig/cairo-ps.pc
 lib/pkgconfig/cairo-script.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-tee.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc
 ${PLIST.xcb}lib/pkgconfig/cairo-xcb-shm.pc
 ${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk
index 0ec993c24be..d1c83c40fbe 100644
--- a/graphics/cairo/options.mk
+++ b/graphics/cairo/options.mk
@@ -1,12 +1,15 @@
-# $NetBSD: options.mk,v 1.15 2013/08/31 22:19:32 adam Exp $
+# $NetBSD: options.mk,v 1.16 2014/05/31 10:16:40 pho Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS=	x11 xcb
+.if exists(/System/Library/Frameworks/Quartz.framework)
+PKG_SUPPORTED_OPTIONS+=	quartz
+.endif
 PKG_SUGGESTED_OPTIONS=	x11 xcb
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		x11 xcb
+PLIST_VARS+=		x11 xcb quartz
 
 ###
 ### X11 and XCB support (XCB implies X11)
@@ -34,3 +37,25 @@ CONFIGURE_ARGS+=	--enable-xcb=no
 CONFIGURE_ARGS+=	--disable-xlib
 CONFIGURE_ARGS+=	--disable-xlib-xrender
 .endif
+
+###
+### Quartz backend
+###
+# Quartz backend interacts badly with our library stack. The most
+# notable issue is that when quartz-font is enabled, cairo will never
+# use fontconfig but instead uses CoreGraphics API to find fonts in
+# system-default font paths; as a result, any fonts installed with
+# pkgsrc will never be found. OTOH fontconfig by default searches for
+# fonts in MacOS X system-default paths too so sticking with it will
+# not be a problem.
+.if !empty(PKG_OPTIONS:Mquartz)
+CONFIGURE_ARGS+=	--enable-quartz
+CONFIGURE_ARGS+=	--enable-quartz-font
+CONFIGURE_ARGS+=	--enable-quartz-image
+PLIST.quartz=		yes
+WARNINGS+=		"You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
+.else
+CONFIGURE_ARGS+=	--disable-quartz
+CONFIGURE_ARGS+=	--disable-quartz-font
+CONFIGURE_ARGS+=	--disable-quartz-image
+.endif