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

through PLIST_SUBST to the plist module.

2 files changed, 51 insertions, 53 deletions

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