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

through PLIST_SUBST to the plist module.

4 files changed, 38 insertions, 39 deletions

diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index b8f1fbb4f2c..a493480eaf8 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.9 2008/04/07 19:44:19 tnn Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $
 bin/openttd
 share/openttd/data/generictrams_v0.4.grf
 share/openttd/data/openttdd.grf
 share/openttd/data/openttdw.grf
 share/openttd/data/opntitle.dat
-${TTD_DATA}share/openttd/data/sample.cat
-${TTD_DATA}share/openttd/data/trg1r.grf
-${TTD_DATA}share/openttd/data/trgcr.grf
-${TTD_DATA}share/openttd/data/trghr.grf
-${TTD_DATA}share/openttd/data/trgir.grf
-${TTD_DATA}share/openttd/data/trgtr.grf
+${PLIST.ttd-data}share/openttd/data/sample.cat
+${PLIST.ttd-data}share/openttd/data/trg1r.grf
+${PLIST.ttd-data}share/openttd/data/trgcr.grf
+${PLIST.ttd-data}share/openttd/data/trghr.grf
+${PLIST.ttd-data}share/openttd/data/trgir.grf
+${PLIST.ttd-data}share/openttd/data/trgtr.grf
 share/openttd/docs/32bpp.txt
 share/openttd/docs/changelog.txt
 share/openttd/docs/known-bugs.txt
 share/openttd/docs/multiplayer.txt
-${TTD_DATA}share/openttd/gm/gm_tt00.gm
-${TTD_DATA}share/openttd/gm/gm_tt01.gm
-${TTD_DATA}share/openttd/gm/gm_tt02.gm
-${TTD_DATA}share/openttd/gm/gm_tt03.gm
-${TTD_DATA}share/openttd/gm/gm_tt04.gm
-${TTD_DATA}share/openttd/gm/gm_tt05.gm
-${TTD_DATA}share/openttd/gm/gm_tt06.gm
-${TTD_DATA}share/openttd/gm/gm_tt07.gm
-${TTD_DATA}share/openttd/gm/gm_tt08.gm
-${TTD_DATA}share/openttd/gm/gm_tt09.gm
-${TTD_DATA}share/openttd/gm/gm_tt10.gm
-${TTD_DATA}share/openttd/gm/gm_tt11.gm
-${TTD_DATA}share/openttd/gm/gm_tt12.gm
-${TTD_DATA}share/openttd/gm/gm_tt13.gm
-${TTD_DATA}share/openttd/gm/gm_tt14.gm
-${TTD_DATA}share/openttd/gm/gm_tt15.gm
-${TTD_DATA}share/openttd/gm/gm_tt16.gm
-${TTD_DATA}share/openttd/gm/gm_tt17.gm
-${TTD_DATA}share/openttd/gm/gm_tt18.gm
-${TTD_DATA}share/openttd/gm/gm_tt19.gm
-${TTD_DATA}share/openttd/gm/gm_tt20.gm
-${TTD_DATA}share/openttd/gm/gm_tt21.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt00.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt01.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt02.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt03.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt04.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt05.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt06.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt07.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt08.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt09.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt10.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt11.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt12.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt13.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt14.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt15.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt16.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt17.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt18.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt19.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt20.gm
+${PLIST.ttd-data}share/openttd/gm/gm_tt21.gm
 share/openttd/lang/afrikaans.lng
 share/openttd/lang/brazilian_portuguese.lng
 share/openttd/lang/bulgarian.lng
diff --git a/games/openttd/options.mk b/games/openttd/options.mk
index b3ea7d0657f..f6eacb44af1 100644
--- a/games/openttd/options.mk
+++ b/games/openttd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/07 19:44:19 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:01 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -8,8 +8,10 @@ PKG_SUGGESTED_OPTIONS=	# empty
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		ttd-data
+
 .if !empty(PKG_OPTIONS:Mttd-data)
-PLIST_SUBST+=		TTD_DATA=""
+PLIST.ttd-data=		yes
 LICENSE=		ttd-pseudolicense
 RESTRICTED=		No redistribution allowed
 NO_BIN_ON_CDROM=	${RESTRICTED}
@@ -37,6 +39,4 @@ post-install-ttd-data: .PHONY
 	  ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/data; done
 	${RUN} for f in ${GMFILES}; do \
 	  ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/gm; done
-.else
-PLIST_SUBST+=	TTD_DATA="@comment "
 .endif
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index cda9ae63c17..fe93391270e 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		7
@@ -34,10 +34,9 @@ CONFIGURE_ARGS+=	--with-ipv6
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
+PLIST_VARS+=		sunaudio
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-PLIST_SUBST+=		COND_SUN=""
-.else
-PLIST_SUBST+=		COND_SUN="@comment "
+PLIST.sunaudio=		yes
 .endif
 
 INSTALLATION_DIRS=	include/QF/GL include/QF/plugin include/QF/ruamoko/gui
diff --git a/games/quakeforge/PLIST b/games/quakeforge/PLIST
index 0818cafb7e4..adc74bc49b7 100644
--- a/games/quakeforge/PLIST
+++ b/games/quakeforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/01/31 17:39:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:01 jlam Exp $
 bin/bsp2img
 bin/hw-master
 bin/nq-glx
@@ -179,7 +179,7 @@ lib/quakeforge/console_server.la
 lib/quakeforge/snd_output_disk.la
 lib/quakeforge/snd_output_oss.la
 lib/quakeforge/snd_output_sdl.la
-${COND_SUN}lib/quakeforge/snd_output_sun.la
+${PLIST.sunaudio}lib/quakeforge/snd_output_sun.la
 lib/quakeforge/snd_render_default.la
 lib/ruamoko/libcsqc.a
 lib/ruamoko/libgui.a