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

through PLIST_SUBST to the plist module.

31 files changed, 206 insertions, 223 deletions

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
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 5f53ae36b78..05f1fe42cfc 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=		camlimages-2.2.0
 PKGREVISION=		5
@@ -28,10 +28,10 @@ BUILD_TARGET+=	all
 PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .endif
 
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD"
-PLIST_SUBST+=	COND_DLL=""
-.else
-PLIST_SUBST+=	COND_DLL="@comment "
+PLIST_VARS+=	dll
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
+    ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD"
+PLIST.dll=	yes
 .endif
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST
index d6108db14d5..010718b10fd 100644
--- a/graphics/camlimages/PLIST
+++ b/graphics/camlimages/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/22 17:07:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:01 jlam Exp $
 lib/ocaml/camlimages/Makefile.config
 lib/ocaml/camlimages/bitmap.cmi
 lib/ocaml/camlimages/bitmap.cmo
@@ -47,12 +47,12 @@ lib/ocaml/camlimages/colorhist.cmo
 lib/ocaml/camlimages/colorhist.cmx
 lib/ocaml/camlimages/colorhist.o
 lib/ocaml/camlimages/config.h
-${COND_DLL}lib/ocaml/camlimages/dllci_freetype.so
-${COND_DLL}lib/ocaml/camlimages/dllci_gif.so
-${COND_DLL}lib/ocaml/camlimages/dllci_jpeg.so
-${COND_DLL}lib/ocaml/camlimages/dllci_png.so
-${COND_DLL}lib/ocaml/camlimages/dllci_tiff.so
-${COND_DLL}lib/ocaml/camlimages/dllci_xpm.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_freetype.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_gif.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_jpeg.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_png.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_tiff.so
+${PLIST.dll}lib/ocaml/camlimages/dllci_xpm.so
 lib/ocaml/camlimages/freetype.cmi
 lib/ocaml/camlimages/freetype.cmo
 lib/ocaml/camlimages/freetype.cmx
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index c11897839f5..ba663cba612 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/02/22 19:01:19 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dia
 #PKG_SUPPORTED_OPTIONS=	gnome cairo
@@ -7,16 +7,17 @@ PKG_SUGGESTED_OPTIONS=	gnome
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		cairo gnome
+
 .if !empty(PKG_OPTIONS:Mgnome)
 USE_DIRS+=		gnome2-1.5
 CONFIGURE_ARGS+=	--enable-gnome
 .  include "../../devel/libgnome/buildlink3.mk"
 .  include "../../devel/libgnomeui/buildlink3.mk"
-PLIST_SUBST+=		GNOME_OPTION=
+PLIST.gnome=		yes
 PLIST_SUBST+=		DIA_HELPDIR=share/gnome/help/dia
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUBST+=		GNOME_OPTION='@comment '
 PLIST_SUBST+=		DIA_HELPDIR=share/dia/help
 .endif
 
@@ -24,8 +25,7 @@ PLIST_SUBST+=		DIA_HELPDIR=share/dia/help
 .if !empty(PKG_OPTIONS:Mcairo)
 CONFIGURE_ARGS+=	--with-cairo
 .  include "../../graphics/cairo/buildlink3.mk"
-PLIST_SUBST+=		CAIRO_OPTION=
+PLIST.cairo=		yes
 .else
 CONFIGURE_ARGS+=	--without-cairo
-PLIST_SUBST+=		CAIRO_OPTION='@comment '
 .endif
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 9ec0fb39fa3..3f5d5808c5d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2008/03/02 15:49:24 adam Exp $
+# $NetBSD: Makefile,v 1.174 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=	gimp-2.4.5
 CATEGORIES=	graphics
@@ -48,10 +48,9 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
+PLIST_VARS+=		remote twain
 .if exists(/System/Library/Frameworks/TWAIN.framework)
-PLIST_SUBST+=	TWAIN=""
-.else
-PLIST_SUBST+=	TWAIN="@comment "
+PLIST.twain=		yes
 .endif
 
 .include "options.mk"
@@ -68,10 +67,8 @@ PLIST_SUBST+=	TWAIN="@comment "
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.if empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
-PLIST_SUBST+=	REMOTE="@comment "
-.else
-PLIST_SUBST+=	REMOTE=""
+.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
+PLIST.remote=	yes
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index ffa8478ef94..358dba0da8c 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.33 2007/11/21 19:52:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2008/04/12 22:43:01 jlam Exp $
 bin/gimp
 bin/gimp-2.4
 bin/gimp-console
 bin/gimp-console-2.4
-${REMOTE}bin/gimp-remote
-${REMOTE}bin/gimp-remote-2.4
+${PLIST.remote}bin/gimp-remote
+${PLIST.remote}bin/gimp-remote-2.4
 bin/gimptool-2.0
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
@@ -226,7 +226,7 @@ lib/gimp/2.0/plug-ins/CML_explorer
 lib/gimp/2.0/plug-ins/FractalExplorer
 lib/gimp/2.0/plug-ins/Lighting
 lib/gimp/2.0/plug-ins/MapObject
-${AALIB}lib/gimp/2.0/plug-ins/aa
+${PLIST.aalib}lib/gimp/2.0/plug-ins/aa
 lib/gimp/2.0/plug-ins/align_layers
 lib/gimp/2.0/plug-ins/animationplay
 lib/gimp/2.0/plug-ins/animoptimize
@@ -295,7 +295,7 @@ lib/gimp/2.0/plug-ins/gtm
 lib/gimp/2.0/plug-ins/guillotine
 lib/gimp/2.0/plug-ins/header
 lib/gimp/2.0/plug-ins/help
-${GNOME}lib/gimp/2.0/plug-ins/helpbrowser
+${PLIST.gnome}lib/gimp/2.0/plug-ins/helpbrowser
 lib/gimp/2.0/plug-ins/hot
 lib/gimp/2.0/plug-ins/ifscompose
 lib/gimp/2.0/plug-ins/illusion
@@ -313,7 +313,7 @@ lib/gimp/2.0/plug-ins/max_rgb
 lib/gimp/2.0/plug-ins/maze
 lib/gimp/2.0/plug-ins/mblur
 lib/gimp/2.0/plug-ins/metadata
-${MNG}lib/gimp/2.0/plug-ins/mng
+${PLIST.mng}lib/gimp/2.0/plug-ins/mng
 lib/gimp/2.0/plug-ins/mosaic
 lib/gimp/2.0/plug-ins/neon
 lib/gimp/2.0/plug-ins/newsprint
@@ -367,7 +367,7 @@ lib/gimp/2.0/plug-ins/spheredesigner
 lib/gimp/2.0/plug-ins/spread
 lib/gimp/2.0/plug-ins/struc
 lib/gimp/2.0/plug-ins/sunras
-${SVG}lib/gimp/2.0/plug-ins/svg
+${PLIST.svg}lib/gimp/2.0/plug-ins/svg
 lib/gimp/2.0/plug-ins/tga
 lib/gimp/2.0/plug-ins/threshold_alpha
 lib/gimp/2.0/plug-ins/tiff-load
@@ -375,7 +375,7 @@ lib/gimp/2.0/plug-ins/tiff-save
 lib/gimp/2.0/plug-ins/tile
 lib/gimp/2.0/plug-ins/tileit
 lib/gimp/2.0/plug-ins/tiler
-${TWAIN}lib/gimp/2.0/plug-ins/twain
+${PLIST.twain}lib/gimp/2.0/plug-ins/twain
 lib/gimp/2.0/plug-ins/uniteditor
 lib/gimp/2.0/plug-ins/unsharp
 lib/gimp/2.0/plug-ins/uri
@@ -995,7 +995,7 @@ share/gimp/2.0/themes/Default/images/stock-question-64.png
 share/gimp/2.0/themes/Default/images/stock-warning-64.png
 share/gimp/2.0/themes/Small/gtkrc
 share/gimp/2.0/tips/gimp-tips.xml
-${TWAIN}share/gimp/2.0/twain/gimp-twain.png
+${PLIST.twain}share/gimp/2.0/twain/gimp-twain.png
 share/gtk-doc/html/libgimp/GimpAspectPreview.html
 share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
 share/gtk-doc/html/libgimp/GimpDrawablePreview.html
@@ -1975,7 +1975,7 @@ share/mime-info/gimp.keys
 @dirrm share/gtk-doc/html/libgimpcolor
 @dirrm share/gtk-doc/html/libgimpbase
 @dirrm share/gtk-doc/html/libgimp
-${TWAIN}@dirrm share/gimp/2.0/twain
+${PLIST.twain}@dirrm share/gimp/2.0/twain
 @dirrm share/gimp/2.0/tips
 @dirrm share/gimp/2.0/themes/Small
 @dirrm share/gimp/2.0/themes/Default/images/preferences
diff --git a/graphics/gimp/options.mk b/graphics/gimp/options.mk
index 4e1b4916e0a..1fe0ddfada2 100644
--- a/graphics/gimp/options.mk
+++ b/graphics/gimp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/10/28 16:43:00 dogcow Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp
 PKG_SUPPORTED_OPTIONS=	aalib gnome mng svg
@@ -6,30 +6,24 @@ PKG_SUGGESTED_OPTIONS=	aalib gnome mng svg
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		aalib gnome mng svg
+
 .if !empty(PKG_OPTIONS:Maalib)
 .include "../../graphics/aalib/buildlink3.mk"
-PLIST_SUBST+=	AALIB=
-.else
-PLIST_SUBST+=	AALIB="@comment "
+PLIST.aalib=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
 .include "../../www/libgtkhtml/buildlink3.mk"
-PLIST_SUBST+=	GNOME=
-.else
-PLIST_SUBST+=	GNOME="@comment "
+PLIST.gnome=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mmng)
 .include "../../graphics/mng/buildlink3.mk"
-PLIST_SUBST+=	MNG=
-.else
-PLIST_SUBST+=	MNG="@comment "
+PLIST.mng=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
-PLIST_SUBST+=	SVG=
-.else
-PLIST_SUBST+=	SVG="@comment "
+PLIST.svg=		yes
 .endif
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index d8516ce00e3..54254fb302b 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=	glitz-0.5.6
 PKGREVISION=	2
@@ -17,11 +17,10 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
 			src/glitz.pc.in
 
+PLIST_VARS+=		agl
 .if exists(/System/Library/Frameworks/AGL.framework)
-PLIST_SUBST+=	AGL=""
-CONFIGURE_ENV+=	AGL_LIBS="-framework AGL"
-.else
-PLIST_SUBST+=	AGL="@comment "
+PLIST.agl=		yes
+CONFIGURE_ENV+=		AGL_LIBS="-framework AGL"
 .endif
 
 .include "options.mk"
diff --git a/graphics/glitz/PLIST b/graphics/glitz/PLIST
index 2237cc0b24e..6c0f4cb04ad 100644
--- a/graphics/glitz/PLIST
+++ b/graphics/glitz/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/23 03:42:43 minskim Exp $
-${AGL}include/glitz-agl.h
-${X11}include/glitz-glx.h
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:01 jlam Exp $
+${PLIST.agl}include/glitz-agl.h
+${PLIST.x11}include/glitz-glx.h
 include/glitz.h
-${AGL}lib/libglitz-agl.la
-${X11}lib/libglitz-glx.la
+${PLIST.agl}lib/libglitz-agl.la
+${PLIST.x11}lib/libglitz-glx.la
 lib/libglitz.la
-${AGL}lib/pkgconfig/glitz-agl.pc
-${X11}lib/pkgconfig/glitz-glx.pc
+${PLIST.agl}lib/pkgconfig/glitz-agl.pc
+${PLIST.x11}lib/pkgconfig/glitz-glx.pc
 lib/pkgconfig/glitz.pc
diff --git a/graphics/glitz/options.mk b/graphics/glitz/options.mk
index 739e8709daf..3b736b814f8 100644
--- a/graphics/glitz/options.mk
+++ b/graphics/glitz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/11/06 11:28:02 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.glitz
 PKG_SUPPORTED_OPTIONS=	x11
@@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11
+
 ###
 ### X11 support
 ###
 .if !empty(PKG_OPTIONS:Mx11)
 LIBS.Darwin+=	-lXext
-PLIST_SUBST+=	X11=""
+PLIST.x11=	yes
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=	build # only for configure
 .include "../../x11/libXt/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-glx
-PLIST_SUBST+=	X11="@comment "
 .endif
diff --git a/graphics/gocr/PLIST b/graphics/gocr/PLIST
index acd9825bc68..a9c03c56408 100644
--- a/graphics/gocr/PLIST
+++ b/graphics/gocr/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/25 02:06:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:01 jlam Exp $
 bin/gocr
-${TK}bin/gocr.tcl
+${PLIST.tk}bin/gocr.tcl
 include/gocr.h
 lib/libPgm2asc.a
 man/man1/gocr.1
diff --git a/graphics/gocr/options.mk b/graphics/gocr/options.mk
index 71fb9929446..103feb959f6 100644
--- a/graphics/gocr/options.mk
+++ b/graphics/gocr/options.mk
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2005/10/25 02:06:57 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gocr
 PKG_SUPPORTED_OPTIONS=	tk
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		tk
+
 .if !empty(PKG_OPTIONS:Mtk)
 DEPENDS+=		tk>=8.4:../../x11/tk
-PLIST_SUBST+=		TK=""
+PLIST.tk=		yes
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/gocr.tcl ${PREFIX}/bin
-.else
-PLIST_SUBST+=		TK="@comment "
 .endif
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 4b4b71c2ebd..42fe1723375 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2008/03/14 12:56:01 gdt Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:01 jlam Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -54,14 +54,14 @@ include/graphviz/usershape.h
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_gd.la
-${GTK}lib/graphviz/libgvplugin_gdk_pixbuf.la
-${GTK}lib/graphviz/libgvplugin_gtk.la
-${TCL}${GUILE}lib/graphviz/guile/libgv_guile.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
+${PLIST.tcl}${PLIST.guile}lib/graphviz/guile/libgv_guile.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 lib/graphviz/libgvplugin_xlib.la
 lib/graphviz/lua/gv.so
-${LUA}lib/graphviz/lua/libgv_lua.la
+${PLIST.lua}lib/graphviz/lua/libgv_lua.la
 lib/graphviz/perl/gv.so
 lib/graphviz/pkgIndex.tcl
 lib/graphviz/python/_gv.so
@@ -71,12 +71,12 @@ lib/graphviz/python25/_gv.so
 lib/graphviz/r/gv.so
 lib/graphviz/ruby/gv.so
 lib/graphviz/tcl/gv.so
-${TCL}lib/graphviz/tcl/libgdtclft.la
-${TCL}${LUA}lib/graphviz/tcl/libgv_tcl.la
-${TCL}lib/graphviz/tcl/libtcldot.la
-${TCL}lib/graphviz/tcl/libtcldot_builtin.la
-${TCL}lib/graphviz/tcl/libtclplan.la
-${TCL}lib/graphviz/tcl/libtkspline.la
+${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la
+${PLIST.tcl}${PLIST.lua}lib/graphviz/tcl/libgv_tcl.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
+${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
+${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
 lib/libagraph.la
 lib/libcdt.la
 lib/libcgraph.la
@@ -121,35 +121,35 @@ man/man3/graph.3
 man/man3/gvc.3
 man/man3/pathplan.3
 man/man7/graphviz.7
-${TCL}man/mann/gdtclft.n
-${TCL}${GUILE}man/mann/gv_guile.n
-${LUA}man/mann/gv_lua.n
-${TCL}${LUA}man/mann/gv_tcl.n
-${TCL}man/mann/tcldot.n
-${TCL}man/mann/tkspline.n
-${TCL}share/graphviz/demo/doted
-${TCL}share/graphviz/demo/doted.README
-${TCL}share/graphviz/demo/entities
-${TCL}share/graphviz/demo/entities.README
-${TCL}share/graphviz/demo/entities.html
-${TCL}share/graphviz/demo/gcat
-${TCL}share/graphviz/demo/gcat.README
-${TCL}share/graphviz/demo/pathplan
-${TCL}share/graphviz/demo/pathplan.README
-${TCL}share/graphviz/demo/pathplan_data/boxes.dat
-${TCL}share/graphviz/demo/pathplan_data/dpd.dat
-${TCL}share/graphviz/demo/pathplan_data/funny.dat
-${TCL}share/graphviz/demo/pathplan_data/maze.dat
-${TCL}share/graphviz/demo/pathplan_data/nested.dat
-${TCL}share/graphviz/demo/pathplan_data/northo.dat
-${TCL}share/graphviz/demo/pathplan_data/obs.dat
-${TCL}share/graphviz/demo/pathplan_data/other.dat
-${TCL}share/graphviz/demo/pathplan_data/paths.dat
-${TCL}share/graphviz/demo/pathplan_data/rotor.dat
-${TCL}share/graphviz/demo/pathplan_data/u.dat
-${TCL}share/graphviz/demo/pathplan_data/unknown.dat
-${TCL}share/graphviz/demo/spline
-${TCL}share/graphviz/demo/spline.README
+${PLIST.tcl}man/mann/gdtclft.n
+${PLIST.tcl}${PLIST.guile}man/mann/gv_guile.n
+${PLIST.lua}man/mann/gv_lua.n
+${PLIST.tcl}${PLIST.lua}man/mann/gv_tcl.n
+${PLIST.tcl}man/mann/tcldot.n
+${PLIST.tcl}man/mann/tkspline.n
+${PLIST.tcl}share/graphviz/demo/doted
+${PLIST.tcl}share/graphviz/demo/doted.README
+${PLIST.tcl}share/graphviz/demo/entities
+${PLIST.tcl}share/graphviz/demo/entities.README
+${PLIST.tcl}share/graphviz/demo/entities.html
+${PLIST.tcl}share/graphviz/demo/gcat
+${PLIST.tcl}share/graphviz/demo/gcat.README
+${PLIST.tcl}share/graphviz/demo/pathplan
+${PLIST.tcl}share/graphviz/demo/pathplan.README
+${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
+${PLIST.tcl}share/graphviz/demo/spline
+${PLIST.tcl}share/graphviz/demo/spline.README
 share/graphviz/doc/AUTHORS
 share/graphviz/doc/COPYING
 share/graphviz/doc/ChangeLog
@@ -267,7 +267,7 @@ share/graphviz/doc/html/info/trapezium.gif
 share/graphviz/doc/html/info/triangle.gif
 share/graphviz/doc/html/info/tripleoctagon.gif
 share/graphviz/doc/html/pspdf.png
-${TCL}share/graphviz/doc/html/tcldot.html
+${PLIST.tcl}share/graphviz/doc/html/tcldot.html
 share/graphviz/doc/html/winbuild.html
 share/graphviz/doc/latex_suggestions.txt
 share/graphviz/doc/pdf/acyclic.pdf
@@ -285,7 +285,7 @@ share/graphviz/doc/pdf/dotty.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
 share/graphviz/doc/pdf/fdp.pdf
 share/graphviz/doc/pdf/gc.pdf
-${TCL}share/graphviz/doc/pdf/gdtclft.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 share/graphviz/doc/pdf/graph.pdf
 share/graphviz/doc/pdf/gvc.pdf
 share/graphviz/doc/pdf/gvcolor.pdf
@@ -301,8 +301,8 @@ share/graphviz/doc/pdf/nop.pdf
 share/graphviz/doc/pdf/pathplan.pdf
 share/graphviz/doc/pdf/prune.pdf
 share/graphviz/doc/pdf/sccmap.pdf
-${TCL}share/graphviz/doc/pdf/tcldot.pdf
-${TCL}share/graphviz/doc/pdf/tkspline.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf
 share/graphviz/doc/pdf/tred.pdf
 share/graphviz/doc/pdf/twopi.pdf
 share/graphviz/doc/pdf/unflatten.pdf
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index 7aa7e47b457..a4142f31326 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/03/11 15:46:57 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
 PKG_SUPPORTED_OPTIONS=	guile lua ocaml swig tcl gtk
@@ -6,21 +6,21 @@ PKG_SUGGESTED_OPTIONS=	lua swig tcl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		guile gtk lua tcl
+
 .if !empty(PKG_OPTIONS:Mguile)
 .include "../../lang/guile/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-guile
-PLIST_SUBST+=		GUILE=""
+PLIST.guile=		yes
 .else
 CONFIGURE_ARGS+=	--disable-guile
-PLIST_SUBST+=		GUILE="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
-PLIST_SUBST+=		LUA=
+PLIST.lua=		yes
 .else
 CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUBST+=		LUA="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mocaml)
@@ -39,17 +39,15 @@ CONFIGURE_ARGS+=	--disable-swig
 .include "../../x11/tk/buildlink3.mk"
 CONFIGURE_ENV+=		TCLCONFIG=${TCLCONFIG_SH:Q}
 CONFIGURE_ENV+=		TKCONFIG=${TKCONFIG_SH:Q}
-PLIST_SUBST+=		TCL=
+PLIST.tcl=		yes
 .else
 CONFIGURE_ARGS+=	--disable-tcl
-PLIST_SUBST+=		TCL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk)
 .include "../../x11/gtk2/buildlink3.mk"
-PLIST_SUBST+=		GTK=
+PLIST.gtk=		yes
 .else
 CONFIGURE_ARGS+=	--without-gdk-pixbuf
 CONFIGURE_ARGS+=	--without-gtk
-PLIST_SUBST+=		GTK="@comment "
 .endif
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index c0c0f2383db..fe6bbbf4e9b 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.9 2007/11/17 01:40:50 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $
 bin/imlib2-config
-${X11}bin/imlib2_bumpmap
-${X11}bin/imlib2_colorspace
+${PLIST.x11}bin/imlib2_bumpmap
+${PLIST.x11}bin/imlib2_colorspace
 bin/imlib2_conv
-${X11}bin/imlib2_grab
-${X11}bin/imlib2_poly
-${X11}bin/imlib2_show
-${X11}bin/imlib2_test
-${X11}bin/imlib2_view
+${PLIST.x11}bin/imlib2_grab
+${PLIST.x11}bin/imlib2_poly
+${PLIST.x11}bin/imlib2_show
+${PLIST.x11}bin/imlib2_test
+${PLIST.x11}bin/imlib2_view
 include/Imlib2.h
 lib/imlib2/filters/bumpmap.la
 lib/imlib2/filters/colormod.la
diff --git a/graphics/imlib2/options.mk b/graphics/imlib2/options.mk
index 1b2c6ebbf06..357477d21df 100644
--- a/graphics/imlib2/options.mk
+++ b/graphics/imlib2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/11/17 01:40:50 obache Exp $
+# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:01 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -22,13 +22,14 @@ CONFIGURE_ARGS+=	--enable-mmx
 CONFIGURE_ARGS+=	--enable-amd64
 .endif
 
+PLIST_VARS+=		x11
+
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-PLIST_SUBST+=		X11=""
+PLIST.x11=		yes
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUBST+=		X11="@comment "
 .endif
 
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index c568beaa7ff..17a8b449a22 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/02/04 15:26:34 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:01 jlam Exp $
 #
 
 DISTNAME=	libggi-2.1.1.src
@@ -27,20 +27,18 @@ CONF_FILES=		${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=		libvgl terminfo xf86dga
+
 .if ${OPSYS} == "NetBSD"
-.if !empty(OS_VERSION:M1.[56].*)
-PLIST_SUBST+=	COND_TERMINFO="@comment "
-.else
-PLIST_SUBST+=	COND_TERMINFO=""
-.endif
+.  if empty(OS_VERSION:M1.[56].*)
+PLIST.terminfo=		yes
+.  endif
 .else
-PLIST_SUBST+=	COND_TERMINFO=""
+PLIST.terminfo=		yes
 .endif
 
 .if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
-PLIST_SUBST+=	COND_LIBVGL=""
-.else
-PLIST_SUBST+=	COND_LIBVGL="@comment "
+PLIST.libvgl=		yes
 .endif
 
 .if ${X11_TYPE} == "modular"
@@ -48,9 +46,7 @@ PLIST_SUBST+=	COND_LIBVGL="@comment "
 .include "../../x11/libXxf86vm/buildlink3.mk"
 PLIST_SUBST+=	COND_XF86DGA=""
 .elif exists(${X11BASE}/include/X11/extensions/xf86dga.h)
-PLIST_SUBST+=	COND_XF86DGA=""
-.else
-PLIST_SUBST+=	COND_XF86DGA="@comment "
+PLIST.xf86dga=		yes
 .endif
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 2a57f4e6284..339bd60e306 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/20 16:28:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:01 jlam Exp $
 bin/cube3d
 bin/ggiteleserver
 bin/monitest
@@ -75,13 +75,13 @@ lib/ggi/display/multi.la
 lib/ggi/display/palemu.la
 lib/ggi/display/sub.la
 lib/ggi/display/tele.la
-${COND_TERMINFO}lib/ggi/display/terminfo.la
+${PLIST.terminfo}lib/ggi/display/terminfo.la
 lib/ggi/display/tile.la
 lib/ggi/display/trueemu.la
-${COND_LIBVGL}lib/ggi/display/vgl.la
-${COND_XF86DGA}lib/ggi/display/xf86dga.la
+${PLIST.libvgl}lib/ggi/display/vgl.la
+${PLIST.xf86dga}lib/ggi/display/xf86dga.la
 lib/ggi/helper/helper_x_dbe.la
-${COND_XF86DGA}lib/ggi/helper/helper_x_dga.la
+${PLIST.xf86dga}lib/ggi/helper/helper_x_dga.la
 lib/ggi/helper/helper_x_evi.la
 lib/ggi/helper/helper_x_shm.la
 lib/ggi/helper/helper_x_vidmode.la
diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index 3d3da4114c1..e4b5ab2b521 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/02/02 19:17:31 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=	libgii-0.9.1.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -31,10 +31,9 @@ PTHREAD_OPTS+=		native
 
 .include "../../mk/pthread.buildlink3.mk"
 
+PLIST_VARS+=		ggtick
 .if empty(PTHREAD_TYPE:Mnative)
-PLIST_SUBST+=		GGTICK=""
-.else
-PLIST_SUBST+=		GGTICK="@comment "
+PLIST.ggtick=		yes
 .endif
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/graphics/libgii/PLIST b/graphics/libgii/PLIST
index c0740184dd4..a2c03079f68 100644
--- a/graphics/libgii/PLIST
+++ b/graphics/libgii/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2005/04/18 15:53:35 wiz Exp $
-${GGTICK}bin/ggtick
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $
+${PLIST.ggtick}bin/ggtick
 bin/mhub
 bin/xsendbut
 include/ggi/errors.h
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index d9bd387cec4..b88da893dd4 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/08 12:22:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:01 jlam Exp $
 #
 
 DISTNAME=		matplotlib-0.87.2
@@ -20,10 +20,9 @@ PYDISTUTILSPKG=		yes
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 
+PLIST_VARS+=		subprocess
 .if ${PYPACKAGE} == "python22" || ${PYPACKAGE} == "python23"
-PLIST_SUBST+=		COND_SUBPROCESS=""
-.else
-PLIST_SUBST+=		COND_SUBPROCESS="@comment "
+PLIST.subprocess=	yes
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST
index a96d572c406..d5ceeac02b9 100644
--- a/graphics/py-matplotlib/PLIST
+++ b/graphics/py-matplotlib/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/30 22:30:43 joerg Exp $
-@comment $NetBSD: PLIST,v 1.7 2006/04/30 22:30:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $
 ${PYSITELIB}/matplotlib/__init__.py
 ${PYSITELIB}/matplotlib/__init__.pyc
 ${PYSITELIB}/matplotlib/__init__.pyo
@@ -474,9 +474,9 @@ ${PYSITELIB}/matplotlib/widgets.pyo
 ${PYSITELIB}/matplotlib/windowing.py
 ${PYSITELIB}/matplotlib/windowing.pyc
 ${PYSITELIB}/matplotlib/windowing.pyo
-${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.py
-${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.pyc
-${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.pyo
+${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.py
+${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyc
+${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyo
 ${PYSITELIB}/pylab.py
 ${PYSITELIB}/pylab.pyc
 ${PYSITELIB}/pylab.pyo
@@ -497,4 +497,4 @@ ${PYSITELIB}/pylab.pyo
 @dirrm ${PYSITELIB}/matplotlib/enthought
 @dirrm ${PYSITELIB}/matplotlib/backends
 @dirrm ${PYSITELIB}/matplotlib
-${COND_SUBPROCESS}@dirrm ${PYSITELIB}/subprocess
+${PLIST.subprocess}@dirrm ${PYSITELIB}/subprocess
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index ef6bb3cbfd1..b96c90f8623 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/05/28 20:35:38 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:01 jlam Exp $
 #
 
 DISTNAME=	rad3R6P1
@@ -32,21 +32,19 @@ PATCHEES=	makeall ./src/rt/Rmakefile ./src/util/Rmakefile		\
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	gl
+
 .if ${OPSYS} == "NetBSD"
 PKGSRC_ARCH=	9
-PLIST_SUBST+=	USE_GL="@comment "
 .elif ${OPSYS} == "FreeBSD"
 PKGSRC_ARCH=	8
-PLIST_SUBST+=	USE_GL="@comment "
 .elif ${OPSYS} == "DragonFly"
 PKGSRC_ARCH=	12
-PLIST_SUBST+=	USE_GL="@comment "
 .elif ${OPSYS} == "Linux"
-PLIST_SUBST+=	USE_GL="@comment "
 PKGSRC_ARCH=	6
 .elif ${OPSYS} == "IRIX"
 PKGSRC_ARCH=	3
-PLIST_SUBST+=	USE_GL=""
+PLIST.gl=	yes
 .endif
 
 MAKE_ENV+=	MV=${MV:Q} RM=${RM:Q} CP=${CP:Q}			\
diff --git a/graphics/radiance/PLIST b/graphics/radiance/PLIST
index 8d9b55cb795..56cb9e445ac 100644
--- a/graphics/radiance/PLIST
+++ b/graphics/radiance/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/05/28 20:35:38 heinz Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:01 jlam Exp $
 radiance/bin/arch2rad
 radiance/bin/bgraph
 radiance/bin/cnt
@@ -26,7 +26,7 @@ radiance/bin/getinfo
 radiance/bin/glare
 radiance/bin/glarendx
 radiance/bin/glaze
-${USE_GL}radiance/bin/glrad
+${PLIST.gl}radiance/bin/glrad
 radiance/bin/histo
 radiance/bin/icalc
 radiance/bin/ies2rad
@@ -123,16 +123,16 @@ radiance/bin/xglaresrc
 radiance/bin/ximage
 radiance/bin/xshowtrace
 radiance/bin/xyzimage
-${USE_GL}radiance/dev/glx1.hdi
-${USE_GL}radiance/dev/glx1h.hdi
-${USE_GL}radiance/dev/ogl.hdi
-${USE_GL}radiance/dev/oglh.hdi
-${USE_GL}radiance/dev/oglo.hdi
-${USE_GL}radiance/dev/ogloh.hdi
-${USE_GL}radiance/dev/ogls.hdi
-${USE_GL}radiance/dev/oglsh.hdi
-${USE_GL}radiance/dev/oglso.hdi
-${USE_GL}radiance/dev/oglsoh.hdi
+${PLIST.gl}radiance/dev/glx1.hdi
+${PLIST.gl}radiance/dev/glx1h.hdi
+${PLIST.gl}radiance/dev/ogl.hdi
+${PLIST.gl}radiance/dev/oglh.hdi
+${PLIST.gl}radiance/dev/oglo.hdi
+${PLIST.gl}radiance/dev/ogloh.hdi
+${PLIST.gl}radiance/dev/ogls.hdi
+${PLIST.gl}radiance/dev/oglsh.hdi
+${PLIST.gl}radiance/dev/oglso.hdi
+${PLIST.gl}radiance/dev/oglsoh.hdi
 radiance/dev/x11.hdi
 radiance/dev/x11h.hdi
 radiance/lib/Earth.cal
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
diff --git a/graphics/zphoto/PLIST b/graphics/zphoto/PLIST
index 6e160b29d79..69d007bf361 100644
--- a/graphics/zphoto/PLIST
+++ b/graphics/zphoto/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/12 16:20:35 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:43:02 jlam Exp $
 bin/zphoto
-${WX_COMMENT}bin/wxzphoto
+${PLIST.wx}bin/wxzphoto
 share/locale/ja/LC_MESSAGES/zphoto.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
 share/zphoto/doc/images/wxzphoto-linux-mini.png
diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk
index 5d46274b572..3750f8f2aff 100644
--- a/graphics/zphoto/options.mk
+++ b/graphics/zphoto/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/11/17 01:47:02 obache Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.zphoto
 PKG_SUPPORTED_OPTIONS=	zip wx
@@ -37,10 +37,10 @@ CONFIGURE_ARGS+=	--disable-zip
 #CONFIGURE_ARGS+=	--disable-avifile
 #.endif
 
+PLIST_VARS+=		wx
 .if !empty(PKG_OPTIONS:Mwx)
 .include "../../x11/wxGTK/buildlink3.mk"
-PLIST_SUBST+=		WX_COMMENT=
+PLIST.wx=		yes
 .else
 CONFIGURE_ARGS+=	--disable-wx
-PLIST_SUBST+=		WX_COMMENT="@comment "
 .endif