From 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 12 Apr 2008 22:42:57 +0000 Subject: Convert to use PLIST_VARS instead of manually passing "@comment " through PLIST_SUBST to the plist module. --- math/py-Numeric/Makefile | 7 +++---- math/py-Numeric/PLIST | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'math/py-Numeric') 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 -- cgit v1.2.3