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

through PLIST_SUBST to the plist module.

6 files changed, 37 insertions, 38 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 613ac60d075..40b6b1ef60b 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2008/03/11 18:47:41 tnn Exp $
+# $NetBSD: Makefile,v 1.55 2008/04/12 22:43:13 jlam Exp $
 #
 
 DISTNAME=		aspell-0.60.5
@@ -46,12 +46,12 @@ PKG_SUPPORTED_OPTIONS=	# none
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		filters
 .if !empty(PKG_OPTIONS:Maspell-loadable-filters)
 CONFIGURE_ARGS+=	--disable-compile-in-filters
-PLIST_SUBST+=		FILTER=""
+PLIST.filters=		yes
 .else
 CONFIGURE_ARGS+=	--enable-compile-in-filters
-PLIST_SUBST+=		FILTER="@comment "
 .endif
 
 REPLACE_PERL=		scripts/aspell-import
diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST
index 7038427ec53..e20ecb103e7 100644
--- a/textproc/aspell/PLIST
+++ b/textproc/aspell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2007/01/06 22:07:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:13 jlam Exp $
 bin/aspell
 bin/aspell-import
 bin/precat
@@ -14,19 +14,19 @@ info/aspell-dev.info
 info/aspell.info
 lib/aspell/ccpp.amf
 lib/aspell/comment.amf
-${FILTER}lib/aspell/context-filter.la
-${FILTER}lib/aspell/email-filter.la
+${PLIST.filters}lib/aspell/context-filter.la
+${PLIST.filters}lib/aspell/email-filter.la
 lib/aspell/email.amf
 lib/aspell/html.amf
 lib/aspell/none.amf
-${FILTER}lib/aspell/nroff-filter.la
+${PLIST.filters}lib/aspell/nroff-filter.la
 lib/aspell/nroff.amf
 lib/aspell/perl.amf
-${FILTER}lib/aspell/sgml-filter.la
+${PLIST.filters}lib/aspell/sgml-filter.la
 lib/aspell/sgml.amf
-${FILTER}lib/aspell/tex-filter.la
+${PLIST.filters}lib/aspell/tex-filter.la
 lib/aspell/tex.amf
-${FILTER}lib/aspell/texinfo-filter.la
+${PLIST.filters}lib/aspell/texinfo-filter.la
 lib/aspell/texinfo.amf
 lib/aspell/url.amf
 lib/libaspell.la
@@ -37,7 +37,7 @@ man/man1/prezip-bin.1
 man/man1/pspell-config.1
 man/man1/run-with-aspell.1
 man/man1/word-list-compress.1
-${FILTER}share/aspell/context-filter.info
+${PLIST.filters}share/aspell/context-filter.info
 share/aspell/cp1250.cmap
 share/aspell/cp1250.cset
 share/aspell/cp1251.cmap
@@ -57,8 +57,8 @@ share/aspell/cp1257.cset
 share/aspell/cp1258.cmap
 share/aspell/cp1258.cset
 share/aspell/dvorak.kbd
-${FILTER}share/aspell/email-filter.info
-${FILTER}share/aspell/html-filter.info
+${PLIST.filters}share/aspell/email-filter.info
+${PLIST.filters}share/aspell/html-filter.info
 share/aspell/iso-8859-1.cmap
 share/aspell/iso-8859-1.cset
 share/aspell/iso-8859-10.cmap
@@ -94,13 +94,13 @@ share/aspell/koi8-r.cmap
 share/aspell/koi8-r.cset
 share/aspell/koi8-u.cmap
 share/aspell/koi8-u.cset
-${FILTER}share/aspell/nroff-filter.info
-${FILTER}share/aspell/sgml-filter.info
+${PLIST.filters}share/aspell/nroff-filter.info
+${PLIST.filters}share/aspell/sgml-filter.info
 share/aspell/spell
 share/aspell/split.kbd
 share/aspell/standard.kbd
-${FILTER}share/aspell/tex-filter.info
-${FILTER}share/aspell/texinfo-filter.info
+${PLIST.filters}share/aspell/tex-filter.info
+${PLIST.filters}share/aspell/texinfo-filter.info
 share/locale/be/LC_MESSAGES/aspell.mo
 share/locale/ca/LC_MESSAGES/aspell.mo
 share/locale/cs/LC_MESSAGES/aspell.mo
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 99ac79bdd80..4852ad97824 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/06/17 14:34:12 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/12 22:43:13 jlam Exp $
 
 DISTNAME=	docutils-0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,10 +17,9 @@ PYDISTUTILSPKG=	YES
 
 .include "../../lang/python/extension.mk"
 
+PLIST_VARS+=	std
 .if !empty(PYVERSSUFFIX:M2*[12])
-PLIST_SUBST+=	PYSTDMODULE=""
-.else
-PLIST_SUBST+=	PYSTDMODULE="@comment "
+PLIST.std=	yes
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-docutils/PLIST b/textproc/py-docutils/PLIST
index 45dd1f42584..314ef42b621 100644
--- a/textproc/py-docutils/PLIST
+++ b/textproc/py-docutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/06/17 14:34:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:13 jlam Exp $
 bin/rst2html.py
 bin/rst2latex.py
 bin/rst2newlatex.py
@@ -335,12 +335,12 @@ ${PYSITELIB}/docutils/writers/s5_html/themes/small-white/pretty.css
 ${PYSITELIB}/roman.py
 ${PYSITELIB}/roman.pyc
 ${PYSITELIB}/roman.pyo
-${PYSTDMODULE}${PYSITELIB}/optparse.py
-${PYSTDMODULE}${PYSITELIB}/optparse.pyc
-${PYSTDMODULE}${PYSITELIB}/optparse.pyo
-${PYSTDMODULE}${PYSITELIB}/textwrap.py
-${PYSTDMODULE}${PYSITELIB}/textwrap.pyc
-${PYSTDMODULE}${PYSITELIB}/textwrap.pyo
+${PLIST.std}${PYSITELIB}/optparse.py
+${PLIST.std}${PYSITELIB}/optparse.pyc
+${PLIST.std}${PYSITELIB}/optparse.pyo
+${PLIST.std}${PYSITELIB}/textwrap.py
+${PLIST.std}${PYSITELIB}/textwrap.pyc
+${PLIST.std}${PYSITELIB}/textwrap.pyo
 @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/small-white
 @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/small-black
 @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/medium-white
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 315e50f522b..ca02f3a4e4c 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/11/03 04:29:13 yyamano Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/12 22:43:13 jlam Exp $
 #
 
 DISTNAME=	xerces-c-src_2_7_0
@@ -37,13 +37,13 @@ CONFIGURE_ARGS+=	-m inmem		# message loader
 CONFIGURE_ARGS+=	-r none			# threading
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
+PLIST_VARS+=		gnu-iconv native-iconv
+
 CONFIGURE_ARGS.gnu-iconv+=	-t IconvGNU	# transcoder
-PLIST_SUBST.gnu-iconv+=		NATIVEICONV="@comment "
-PLIST_SUBST.gnu-iconv+=		GNUICONV=""
+PLIST.gnu-iconv=		yes
 
 CONFIGURE_ARGS.native-iconv+=	-t native	# transcoder
-PLIST_SUBST.native-iconv+=	NATIVEICONV=""
-PLIST_SUBST.native-iconv+=	GNUICONV="@comment "
+PLIST.native-iconv=		yes
 
 CONFIGURE_ENV+=		${XERCES_ENV}
 MAKE_ENV+=		${XERCES_ENV}
diff --git a/textproc/xerces-c/PLIST b/textproc/xerces-c/PLIST
index 674c728d704..5869e66fcc0 100644
--- a/textproc/xerces-c/PLIST
+++ b/textproc/xerces-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/08/22 16:30:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $
 include/xercesc/dom/DOM.hpp
 include/xercesc/dom/DOMAttr.hpp
 include/xercesc/dom/DOMBuilder.hpp
@@ -319,8 +319,8 @@ include/xercesc/util/SynchronizedStringPool.hpp
 include/xercesc/util/TransENameMap.c
 include/xercesc/util/TransENameMap.hpp
 include/xercesc/util/TransService.hpp
-${GNUICONV}include/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
-${NATIVEICONV}include/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+${PLIST.gnu-iconv}include/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
+${PLIST.native-iconv}include/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
 include/xercesc/util/TranscodingException.hpp
 include/xercesc/util/UTFDataFormatException.hpp
 include/xercesc/util/UnexpectedEOFException.hpp
@@ -514,8 +514,8 @@ lib/libxerces-depdom.so.27.0
 @dirrm include/xercesc/validators/DTD
 @dirrm include/xercesc/validators
 @dirrm include/xercesc/util/regx
-${GNUICONV}@dirrm include/xercesc/util/Transcoders/IconvGNU
-${NATIVEICONV}@dirrm include/xercesc/util/Transcoders/Iconv
+${PLIST.gnu-iconv}@dirrm include/xercesc/util/Transcoders/IconvGNU
+${PLIST.native-iconv}@dirrm include/xercesc/util/Transcoders/Iconv
 @dirrm include/xercesc/util/Transcoders
 @dirrm include/xercesc/util/Platforms/${OPSYS}
 @dirrm include/xercesc/util/Platforms