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

through PLIST_SUBST to the plist module.

6 files changed, 26 insertions, 29 deletions

diff --git a/math/maxima/PLIST b/math/maxima/PLIST
index 9dca5c70f70..cc0685f1893 100644
--- a/math/maxima/PLIST
+++ b/math/maxima/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.9 2008/01/28 12:08:49 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:04 jlam Exp $
 bin/maxima
 bin/rmaxima
 bin/xmaxima
 info/maxima-index.lisp
 info/maxima.info
 info/xmaxima.info
-${clisp}lib/maxima/${PKGVERSION}/binary-clisp/lisp.run
-${clisp}lib/maxima/${PKGVERSION}/binary-clisp/maxima.mem
-${sbcl}lib/maxima/${PKGVERSION}/binary-sbcl/maxima.core
+${PLIST.clisp}lib/maxima/${PKGVERSION}/binary-clisp/lisp.run
+${PLIST.clisp}lib/maxima/${PKGVERSION}/binary-clisp/maxima.mem
+${PLIST.sbcl}lib/maxima/${PKGVERSION}/binary-sbcl/maxima.core
 libexec/maxima/${PKGVERSION}/mgnuplot
 man/man1/maxima.1
 share/maxima/${PKGVERSION}/demo/array.dem
@@ -1646,7 +1646,7 @@ share/maxima/${PKGVERSION}/xmaxima/plotmaxima.html
 @dirrm share/maxima
 @dirrm libexec/maxima/${PKGVERSION}
 @dirrm libexec/maxima
-${clisp}@dirrm lib/maxima/${PKGVERSION}/binary-clisp
-${sbcl}@dirrm lib/maxima/${PKGVERSION}/binary-sbcl
+${PLIST.clisp}@dirrm lib/maxima/${PKGVERSION}/binary-clisp
+${PLIST.sbcl}@dirrm lib/maxima/${PKGVERSION}/binary-sbcl
 @dirrm lib/maxima/${PKGVERSION}
 @dirrm lib/maxima
diff --git a/math/maxima/options.mk b/math/maxima/options.mk
index 3484ea750fb..7c048090e31 100644
--- a/math/maxima/options.mk
+++ b/math/maxima/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/01/28 12:08:49 reinoud Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:04 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.maxima
 PKG_OPTIONS_REQUIRED_GROUPS=	lisp
@@ -19,10 +19,9 @@ CONFIGURE_ARGS+=	--enable-sbcl
 .endif
 
 # Modify PLIST
-.for opt in clisp sbcl
-.if !empty(PKG_OPTIONS:M${opt})
-PLIST_SUBST+=	${opt}=""
-.else
-PLIST_SUBST+=	${opt}="@comment "
-.endif
+PLIST_VARS+=		${PKG_OPTIONS_GROUP.lisp}
+.for opt in ${PKG_OPTIONS_GROUP.lisp}
+.  if !empty(PKG_OPTIONS:M${opt})
+PLIST.${opt}=		yes
+.  endif
 .endfor
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 95f47d67e4b..19a97449faf 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/08/24 08:58:28 heinz Exp $
+# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:04 jlam Exp $
 
 DISTNAME=	Numeric-24.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,11 +16,10 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 22
 PYBINMODULE=	yes
 PYSETUP=	setup.py
 
+PLIST_VARS+=	blas
 .if exists(/System/Library/Frameworks/vecLib.framework)
 BUILDLINK_PASSTHRU_DIRS+=	/System/Library/Frameworks/vecLib.framework/Headers
-PLIST_SUBST+=	DOTBLAS=""
-.else
-PLIST_SUBST+=	DOTBLAS="@comment "
+PLIST.blas=	yes
 .endif
 
 .include "../../lang/python/extension.mk"
diff --git a/math/py-Numeric/PLIST b/math/py-Numeric/PLIST
index 284e4f08dae..4082090638c 100644
--- a/math/py-Numeric/PLIST
+++ b/math/py-Numeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/03/01 19:15:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:04 jlam Exp $
 ${PYINC}/Numeric/arrayobject.h
 ${PYINC}/Numeric/f2c.h
 ${PYINC}/Numeric/ranlib.h
@@ -54,12 +54,12 @@ ${PYSITELIB}/Numeric/RandomArray.pyo
 ${PYSITELIB}/Numeric/UserArray.py
 ${PYSITELIB}/Numeric/UserArray.pyc
 ${PYSITELIB}/Numeric/UserArray.pyo
-${DOTBLAS}${PYSITELIB}/Numeric/_dotblas.so
+${PLIST.blas}${PYSITELIB}/Numeric/_dotblas.so
 ${PYSITELIB}/Numeric/_numpy.so
 ${PYSITELIB}/Numeric/arrayfns.so
-${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.py
-${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.pyc
-${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.pyo
+${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.py
+${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.pyc
+${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.pyo
 ${PYSITELIB}/Numeric/lapack_lite.so
 ${PYSITELIB}/Numeric/multiarray.so
 ${PYSITELIB}/Numeric/numeric_version.py
@@ -67,7 +67,7 @@ ${PYSITELIB}/Numeric/numeric_version.pyc
 ${PYSITELIB}/Numeric/numeric_version.pyo
 ${PYSITELIB}/Numeric/ranlib.so
 ${PYSITELIB}/Numeric/umath.so
-${DOTBLAS}@dirrm ${PYSITELIB}/Numeric/dotblas
+${PLIST.blas}@dirrm ${PYSITELIB}/Numeric/dotblas
 @dirrm ${PYSITELIB}/Numeric/RNG
 @dirrm ${PYSITELIB}/Numeric/Numeric_headers
 @dirrm ${PYSITELIB}/Numeric/MA
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index c7b5a5f8c77..58f8b704bce 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/17 14:25:43 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/12 22:43:04 jlam Exp $
 #
 
 DISTNAME=	numarray-1.5.2
@@ -13,11 +13,10 @@ COMMENT=	Array manipulation
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONS_ACCEPTED= 24 23 22
 
+PLIST_VARS+=	blas
 .if exists(/System/Library/Frameworks/vecLib.framework/Headers)
 BUILDLINK_PASSTHRU_DIRS+=	/System/Library/Frameworks/vecLib.framework/Headers
-PLIST_SUBST+=	DOTBLAS=""
-.else
-PLIST_SUBST+=	DOTBLAS="@comment "
+PLIST.blas=	yes
 .endif
 
 do-test:
diff --git a/math/py-numarray/PLIST b/math/py-numarray/PLIST
index fee92efb2a6..2623f8d61a4 100644
--- a/math/py-numarray/PLIST
+++ b/math/py-numarray/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/08 17:21:34 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:04 jlam Exp $
 ${PYINC}/numarray/arraybase.h
 ${PYINC}/numarray/arrayif.h
 ${PYINC}/numarray/arrayobject.h
@@ -20,7 +20,7 @@ ${PYSITELIB}/numarray/_bytes.so
 ${PYSITELIB}/numarray/_chararray.so
 ${PYSITELIB}/numarray/_conv.so
 ${PYSITELIB}/numarray/_converter.so
-${DOTBLAS}${PYSITELIB}/numarray/_dotblas.so
+${PLIST.blas}${PYSITELIB}/numarray/_dotblas.so
 ${PYSITELIB}/numarray/_ndarray.so
 ${PYSITELIB}/numarray/_numarray.so
 ${PYSITELIB}/numarray/_numerictype.so