Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 18 insertions, 17 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index f47aba763d1..3c6b7366fcb 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/06/08 20:50:55 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:02 jlam Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
@@ -20,15 +20,15 @@ CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=		pint sm3600
+
 .if (${OPSYS} == "SunOS")
-PLIST_SUBST+=	SANE_PINT="@comment "
-PLIST_SUBST+=	SANE_SM3600="@comment "
+# nothing
 .elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly")
-PLIST_SUBST+=	SANE_PINT="@comment "
-PLIST_SUBST+=	SANE_SM3600=""
+PLIST.sm3600=		yes
 .else
-PLIST_SUBST+=	SANE_PINT=""
-PLIST_SUBST+=	SANE_SM3600=""
+PLIST.pint=		yes
+PLIST.sm3600=		yes
 .endif
 
 OWN_DIRS+=	${PKG_SYSCONFDIR}/sane.d
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index ff3383d4987..69cde491ace 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/08/05 22:41:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:02 jlam Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -29,7 +29,7 @@ lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp3500.la
-${SANE_HP3900}lib/sane/libsane-hp3900.la
+${PLIST.hp3900}lib/sane/libsane-hp3900.la
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.la
 lib/sane/libsane-ibm.la
@@ -46,7 +46,7 @@ lib/sane/libsane-nec.la
 lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
 lib/sane/libsane-pie.la
-${SANE_PINT}lib/sane/libsane-pint.la
+${PLIST.pint}lib/sane/libsane-pint.la
 lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
@@ -54,7 +54,7 @@ lib/sane/libsane-ricoh.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
-${SANE_SM3600}lib/sane/libsane-sm3600.la
+${PLIST.sm3600}lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3840.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
@@ -98,7 +98,7 @@ man/man5/sane-gphoto2.5
 man/man5/sane-gt68xx.5
 man/man5/sane-hp.5
 man/man5/sane-hp3500.5
-${SANE_HP3900}man/man5/sane-hp3900.5
+${PLIST.hp3900}man/man5/sane-hp3900.5
 man/man5/sane-hp4200.5
 man/man5/sane-hp5400.5
 man/man5/sane-hpsj5s.5
@@ -252,7 +252,7 @@ share/examples/sane/fujitsu.conf
 share/examples/sane/genesys.conf
 share/examples/sane/gt68xx.conf
 share/examples/sane/hp.conf
-${SANE_HP3900}share/examples/sane/hp3900.conf
+${PLIST.hp3900}share/examples/sane/hp3900.conf
 share/examples/sane/hp4200.conf
 share/examples/sane/hp5400.conf
 share/examples/sane/ibm.conf
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index a1a474a7a30..9bc7beaab55 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/10/20 03:49:17 obache Exp $
+# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:02 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.sane-backends
 PKG_SUPPORTED_OPTIONS=		inet6 sane-backends-hp3900
@@ -14,16 +14,17 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+
 ###
 ### hp3900 support
 ###
+PLIST_VARS+=	hp3900
+
 .if !empty(PKG_OPTIONS:Mhp3900)
-PLIST_SUBST+=	SANE_HP3900=""
+PLIST.hp3900=	yes
 DISTFILES+=	hp3900-sane1017_src_0.5.tar.gz
 SITES.hp3900-sane1017_src_0.5.tar.gz=${MASTER_SITE_SOURCEFORGE:=hp3900-series/}
 post-patch:
 	cd ${WRKSRC} && \
 	${PATCH} -p1 <${WRKDIR}/hp3900-sane1017_src_0.5/hp3900-sane1017_0.5.diff
-.else
-PLIST_SUBST+=	SANE_HP3900="@comment "
 .endif