From 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 12 Apr 2008 22:42:57 +0000
Subject: Convert to use PLIST_VARS instead of manually passing "@comment "
 through PLIST_SUBST to the plist module.

---
 graphics/cairo/Makefile   |  7 +++----
 graphics/cairo/PLIST      | 18 +++++++++---------
 graphics/cairo/options.mk |  7 ++++---
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'graphics/cairo')

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 1526e73cee2..6c317c2be99 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2008/03/12 20:48:11 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=	cairo-1.4.14
 CATEGORIES=	graphics
@@ -21,12 +21,11 @@ CONFIGURE_ARGS+=	--enable-glitz
 CONFIGURE_ARGS+=	--enable-pdf
 CONFIGURE_ARGS+=	--enable-ps
 
+PLIST_VARS+=		carbon
 .if exists(/System/Library/Frameworks/Carbon.framework)
 CONFIGURE_ARGS+=	--enable-quartz
 CONFIGURE_ARGS+=	--enable-atsui
-PLIST_SUBST+=		CARBON=
-.else
-PLIST_SUBST+=		CARBON="@comment "
+PLIST.carbon=		yes
 .endif
 
 .include "options.mk"
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 9840d494c56..aee90f7eafc 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.17 2007/06/15 17:47:59 drochner Exp $
-${CARBON}include/cairo/cairo-atsui.h
+@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:01 jlam Exp $
+${PLIST.carbon}include/cairo/cairo-atsui.h
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-glitz.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
-${CARBON}include/cairo/cairo-quartz.h
+${PLIST.carbon}include/cairo/cairo-quartz.h
 include/cairo/cairo-svg.h
-${X11}include/cairo/cairo-xlib-xrender.h
-${X11}include/cairo/cairo-xlib.h
+${PLIST.x11}include/cairo/cairo-xlib-xrender.h
+${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/libcairo.la
-${CARBON}lib/pkgconfig/cairo-atsui.pc
+${PLIST.carbon}lib/pkgconfig/cairo-atsui.pc
 lib/pkgconfig/cairo-ft.pc
 lib/pkgconfig/cairo-glitz.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
-${CARBON}lib/pkgconfig/cairo-quartz.pc
+${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc
 lib/pkgconfig/cairo-svg.pc
-${X11}lib/pkgconfig/cairo-xlib-xrender.pc
-${X11}lib/pkgconfig/cairo-xlib.pc
+${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
+${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc
 share/gtk-doc/html/cairo/Drawing.html
 share/gtk-doc/html/cairo/Fonts.html
diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk
index 348dbca0290..0c4b45e8444 100644
--- a/graphics/cairo/options.mk
+++ b/graphics/cairo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/11/29 22:13:58 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS=	x11
@@ -6,12 +6,14 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11
+
 ###
 ### X11 support
 ###
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-xlib --enable-xlib-xrender
-PLIST_SUBST+=		X11=""
+PLIST.x11=		yes
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
@@ -21,5 +23,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build # only for configure
 .include "../../x11/libXt/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xlib --disable-xlib-xrender
-PLIST_SUBST+=		X11="@comment "
 .endif
-- 
cgit v1.2.3