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

through PLIST_SUBST to the plist module.

4 files changed, 24 insertions, 27 deletions

diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
index 2092c731e9e..676ac7d4764 100644
--- a/emulators/p11/Makefile
+++ b/emulators/p11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/27 12:02:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $
 #
 
 DISTNAME=	p11-2.10i
@@ -16,27 +16,23 @@ USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=		bpf tap tun
+
 # bfp, tap, and tun tests taken from p11 configure script
 .if exists(/dev/bpf0)
-PLIST_SUBST+=		BPF=
-.else
-PLIST_SUBST+=		BPF="@comment "
+PLIST.bpf=		yes
 .endif
 .if exists(/dev/tap0) || exists(/dev/net/tun)
-PLIST_SUBST+=		TAP=
-.elif ${OPSYS} == "DragonFly"
-PLIST_SUBST+=		TAP=		# DragonFly has TAP
-.else
-PLIST_SUBST+=		TAP="@comment "
+PLIST.tap=		yes
 .endif
-.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) || ${OPSYS} == "DragonFly"
-PLIST_SUBST+=		TUN=
-.else
-PLIST_SUBST+=		TUN="@comment "
+.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun)
+PLIST.tun=		yes
 .endif
 
 # Force the bpf, tun, and tap epp backends to be built on DragonFly.
 .if ${OPSYS} == "DragonFly"
+PLIST.tap=		yes
+PLIST.tun=		yes
 CONFIGURE_ENV+=		ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes
 .endif
 
diff --git a/emulators/p11/PLIST b/emulators/p11/PLIST
index 626502a0085..4cb3dfb5755 100644
--- a/emulators/p11/PLIST
+++ b/emulators/p11/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/16 16:15:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:00 jlam Exp $
 bin/p11
-${BPF}libexec/p11/epp_bpf
+${PLIST.bpf}libexec/p11/epp_bpf
 libexec/p11/epp_fifo
-${TAP}libexec/p11/epp_tap
-${TUN}libexec/p11/epp_tun
+${PLIST.tap}libexec/p11/epp_tap
+${PLIST.tun}libexec/p11/epp_tun
 libexec/p11/fmt
 libexec/p11/lp_file
 libexec/p11/tty_fifo
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 3e6698f23ab..e78f986c631 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.67 2007/08/11 11:06:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.68 2008/04/12 22:43:00 jlam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -562,7 +562,7 @@ lib/wine/faultrep.dll.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
-${WINE_OPENGL}lib/wine/glu32.dll.so
+${PLIST.opengl}lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
 lib/wine/hal.dll.so
 lib/wine/hh.exe.so
@@ -629,7 +629,7 @@ lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libgdiplus.def
-${WINE_OPENGL}lib/wine/libglu32.def
+${PLIST.opengl}lib/wine/libglu32.def
 lib/wine/libhid.def
 lib/wine/libhlink.def
 lib/wine/libicmp.def
@@ -669,7 +669,7 @@ lib/wine/libolecli32.def
 lib/wine/liboledlg.def
 lib/wine/libolepro32.def
 lib/wine/libolesvr32.def
-${WINE_OPENGL}lib/wine/libopengl32.def
+${PLIST.opengl}lib/wine/libopengl32.def
 lib/wine/libpdh.def
 lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
@@ -704,7 +704,7 @@ lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libwinecrt0.a
-${WINE_OPENGL}lib/wine/libwined3d.def
+${PLIST.opengl}lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
@@ -789,7 +789,7 @@ lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
-${WINE_OPENGL}lib/wine/opengl32.dll.so
+${PLIST.opengl}lib/wine/opengl32.dll.so
 lib/wine/oleview.exe.so
 lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
@@ -878,7 +878,7 @@ lib/wine/winebrowser.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/winecoreaudio.drv.so
-${WINE_OPENGL}lib/wine/wined3d.dll.so
+${PLIST.opengl}lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winedos.dll.so
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 68a9c2e4229..2321013e327 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/04/13 21:25:48 adam Exp $
+# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:00 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups opengl sane
@@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS=	opengl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		opengl
+
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
-PLIST_SUBST+=	WINE_OPENGL=""
+PLIST.opengl=		yes
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-opengl
-PLIST_SUBST+=	WINE_OPENGL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Msane)