From 31597853cc377bc7f255d79b8cbdba990fd506a1 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.

---
 print/ghostscript/PLIST      | 12 ++++++------
 print/ghostscript/options.mk |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'print/ghostscript')

diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST
index b5d610a5c42..30cb1036dc2 100644
--- a/print/ghostscript/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/03/10 12:34:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:09 jlam Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -31,8 +31,8 @@ bin/ps2ps2
 bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
-${CUPS}libexec/cups/filter/pstopxl
-${CUPS}libexec/cups/filter/pstoraster
+${PLIST.cups}libexec/cups/filter/pstopxl
+${PLIST.cups}libexec/cups/filter/pstoraster
 man/de/man1/dvipdf.1
 man/de/man1/eps2eps.1
 man/de/man1/font2c.1
@@ -71,9 +71,9 @@ man/man1/ps2pdf13.1
 man/man1/ps2pdfwr.1
 man/man1/ps2ps.1
 man/man1/wftopfa.1
-${CUPS}share/cups/model/pxlcolor.ppd
-${CUPS}share/cups/model/pxlmono.ppd
-${CUPS}share/examples/cups/pstoraster.convs
+${PLIST.cups}share/cups/model/pxlcolor.ppd
+${PLIST.cups}share/cups/model/pxlmono.ppd
+${PLIST.cups}share/examples/cups/pstoraster.convs
 share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H
 share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V
 share/ghostscript/${PKGVERSION}/Resource/CMap/78-H
diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk
index a2919b2180e..a3b449a5f3b 100644
--- a/print/ghostscript/options.mk
+++ b/print/ghostscript/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2008/01/24 15:17:30 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:09 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups fontconfig
@@ -15,9 +15,10 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--without-x
 .endif
 
+PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=	--enable-cups
-PLIST_SUBST+=		CUPS=
+PLIST.cups=		yes
 
 CUPS_CONFDIR?=	${PKG_SYSCONFBASEDIR}/cups
 CUPS_EGDIR=	${PREFIX}/share/examples/cups
@@ -32,7 +33,6 @@ SUBST_SED.cupsetc=	-e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
 .include "../../print/cups/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cups
-PLIST_SUBST+=		CUPS="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mfontconfig)
-- 
cgit v1.2.3