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

through PLIST_SUBST to the plist module.

7 files changed, 18 insertions, 19 deletions

diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 32097704803..b7f11d17c96 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/03/04 14:47:29 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2008/04/12 22:43:14 jlam Exp $
 #
 
 DISTNAME=	lablgtk-2.10.1
@@ -21,12 +21,11 @@ CONFLICTS=	lablgtk2-2.*
 .include "../../mk/bsd.prefs.mk"
 
 # Stub libraries for functions missing from base system.
+PLIST_VARS+=	stubs
 .if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
     ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
-PLIST_SUBST+=	HAVE_STUBS=""
-.else
-PLIST_SUBST+=	HAVE_STUBS="@comment "
+PLIST.stubs=	yes
 .endif
 
 .include "options.mk"
diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST
index eda14a7a00e..a287adb0a17 100644
--- a/x11/lablgtk/PLIST
+++ b/x11/lablgtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/10/27 13:29:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:14 jlam Exp $
 bin/gdk-pixbuf-mlsource
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
@@ -254,8 +254,8 @@ lib/ocaml/lablgtk2/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtk2.so
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtkspell.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so
 @comment in ocaml: lib/ocaml/stublibs
 @dirrm lib/ocaml/lablgtk2
 @comment in ocaml: lib/ocaml
diff --git a/x11/lablgtk/PLIST.glade b/x11/lablgtk/PLIST.glade
index d8ebf475808..a2786e73835 100644
--- a/x11/lablgtk/PLIST.glade
+++ b/x11/lablgtk/PLIST.glade
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.glade,v 1.1 2007/09/21 13:00:51 wiz Exp $
+@comment $NetBSD: PLIST.glade,v 1.2 2008/04/12 22:43:14 jlam Exp $
 bin/lablgladecc2
 lib/ocaml/lablgtk2/glade.cmi
 lib/ocaml/lablgtk2/glade.cmx
@@ -7,4 +7,4 @@ lib/ocaml/lablgtk2/lablglade.a
 lib/ocaml/lablgtk2/lablglade.cma
 lib/ocaml/lablgtk2/lablglade.cmxa
 lib/ocaml/lablgtk2/liblablglade2.a
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablglade2.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablglade2.so
diff --git a/x11/lablgtk/PLIST.gnome b/x11/lablgtk/PLIST.gnome
index 3cf92d20514..6a62ef7af08 100644
--- a/x11/lablgtk/PLIST.gnome
+++ b/x11/lablgtk/PLIST.gnome
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gnome,v 1.1 2007/09/21 13:00:51 wiz Exp $
+@comment $NetBSD: PLIST.gnome,v 1.2 2008/04/12 22:43:14 jlam Exp $
 lib/ocaml/lablgtk2/gnoDruid.cmi
 lib/ocaml/lablgtk2/gnoDruid.cmx
 lib/ocaml/lablgtk2/gnoDruid.ml
@@ -10,4 +10,4 @@ lib/ocaml/lablgtk2/lablgnomeui.a
 lib/ocaml/lablgtk2/lablgnomeui.cma
 lib/ocaml/lablgtk2/lablgnomeui.cmxa
 lib/ocaml/lablgtk2/liblablgnomeui.a
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so
diff --git a/x11/lablgtk/PLIST.gnomecanvas b/x11/lablgtk/PLIST.gnomecanvas
index dd629b9e7d0..48a1d3eaa47 100644
--- a/x11/lablgtk/PLIST.gnomecanvas
+++ b/x11/lablgtk/PLIST.gnomecanvas
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/09/21 13:00:52 wiz Exp $
+@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2008/04/12 22:43:14 jlam Exp $
 lib/ocaml/lablgtk2/gnoCanvas.cmi
 lib/ocaml/lablgtk2/gnoCanvas.cmx
 lib/ocaml/lablgtk2/gnoCanvas.ml
@@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/panel.cmi
 lib/ocaml/lablgtk2/panel.cmx
 lib/ocaml/lablgtk2/panel.ml
 lib/ocaml/lablgtk2/panel_tags.h
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomecanvas.so
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablpanel.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomecanvas.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablpanel.so
diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview
index ed5621df5a2..19d512690a5 100644
--- a/x11/lablgtk/PLIST.gtksourceview
+++ b/x11/lablgtk/PLIST.gtksourceview
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtksourceview,v 1.1 2007/10/27 13:29:38 wiz Exp $
+@comment $NetBSD: PLIST.gtksourceview,v 1.2 2008/04/12 22:43:14 jlam Exp $
 lib/ocaml/lablgtk2/gSourceView.cmi
 lib/ocaml/lablgtk2/gSourceView.cmx
 lib/ocaml/lablgtk2/gSourceView.ml
@@ -13,4 +13,4 @@ lib/ocaml/lablgtk2/sourceViewEnums.cmi
 lib/ocaml/lablgtk2/sourceViewEnums.cmx
 lib/ocaml/lablgtk2/sourceViewEnums.ml
 lib/ocaml/lablgtk2/sourceView_tags.h
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtksourceview.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgtksourceview.so
diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg
index 4fe38479743..8ac969e1aae 100644
--- a/x11/lablgtk/PLIST.svg
+++ b/x11/lablgtk/PLIST.svg
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.svg,v 1.1 2007/09/21 13:00:53 wiz Exp $
+@comment $NetBSD: PLIST.svg,v 1.2 2008/04/12 22:43:14 jlam Exp $
 lib/ocaml/lablgtk2/gnoDruid.cmi
 lib/ocaml/lablgtk2/gnoDruid.cmx
 lib/ocaml/lablgtk2/gnoDruid.ml
@@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/rsvg.cmi
 lib/ocaml/lablgtk2/rsvg.cmx
 lib/ocaml/lablgtk2/rsvg.ml
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so
-${HAVE_STUBS}lib/ocaml/stublibs/dlllablrsvg.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so
+${PLIST.stubs}lib/ocaml/stublibs/dlllablrsvg.so