use PLIST_SUBST instead of sed, as suggested by Thomas Klausner

2 files changed, 68 insertions, 77 deletions

diff --git a/lang/python/extension.buildlink.mk b/lang/python/extension.buildlink.mk
index 976b5d5c332..b8bd94eaa86 100644
--- a/lang/python/extension.buildlink.mk
+++ b/lang/python/extension.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.buildlink.mk,v 1.2 2001/10/29 05:45:09 jmc Exp $
+# $NetBSD: extension.buildlink.mk,v 1.3 2001/10/29 16:34:40 drochner Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -95,15 +95,6 @@ do-install:
 	(cd ${WRKSRC} && ${PYTHONBIN} ${PYSETUP} ${PYSETUPINSTALLARGS} install)
 .endif
 
-PY_PLIST_TEMPLATE?=	${PKGDIR}/PLIST
-PY_PLIST_SRC?=		${WRKDIR}/.PLIST_SRC
-
-py_patchplist:
-	${SED} "s|PYINC|${PYINC}|g;s|PYSITELIB|${PYSITELIB}|g" \
-	<${PY_PLIST_TEMPLATE} >${PY_PLIST_SRC}
-
 .if defined(PY_PATCHPLIST)
-PLIST_SRC?=	${PY_PLIST_SRC}
-
-pre-install: py_patchplist
+PLIST_SUBST+=	PYINC=${PYINC} PYSITELIB=${PYSITELIB}
 .endif
diff --git a/math/py-Numeric/pkg/PLIST b/math/py-Numeric/pkg/PLIST
index 0536628eb0b..ed85a4cba29 100644
--- a/math/py-Numeric/pkg/PLIST
+++ b/math/py-Numeric/pkg/PLIST
@@ -1,66 +1,66 @@
-@comment $NetBSD: PLIST,v 1.7 2001/07/11 10:32:01 drochner Exp $
-PYINC/Numeric/arrayobject.h
-PYINC/Numeric/f2c.h
-PYINC/Numeric/ranlib.h
-PYINC/Numeric/ufuncobject.h
-PYSITELIB/FFT/FFT.py
-PYSITELIB/FFT/FFT.pyc
-PYSITELIB/FFT/__init__.py
-PYSITELIB/FFT/__init__.pyc
-PYSITELIB/FFT/fftpack.so
-PYSITELIB/MA/MA.py
-PYSITELIB/MA/MA.pyc
-PYSITELIB/MA/MA_version.py
-PYSITELIB/MA/MA_version.pyc
-PYSITELIB/MA/__init__.py
-PYSITELIB/MA/__init__.pyc
-PYSITELIB/Numeric/ArrayPrinter.py
-PYSITELIB/Numeric/ArrayPrinter.pyc
-PYSITELIB/Numeric/LinearAlgebra.py
-PYSITELIB/Numeric/LinearAlgebra.pyc
-PYSITELIB/Numeric/MLab.py
-PYSITELIB/Numeric/MLab.pyc
-PYSITELIB/Numeric/Matrix.py
-PYSITELIB/Numeric/Matrix.pyc
-PYSITELIB/Numeric/Numeric.py
-PYSITELIB/Numeric/Numeric.pyc
-PYSITELIB/Numeric/Precision.py
-PYSITELIB/Numeric/Precision.pyc
-PYSITELIB/Numeric/RandomArray.py
-PYSITELIB/Numeric/RandomArray.pyc
-PYSITELIB/Numeric/UserArray.py
-PYSITELIB/Numeric/UserArray.pyc
-PYSITELIB/Numeric/_numpy.so
-PYSITELIB/Numeric/arrayfns.so
-PYSITELIB/Numeric/lapack_lite.so
-PYSITELIB/Numeric/multiarray.so
-PYSITELIB/Numeric/numeric_version.py
-PYSITELIB/Numeric/numeric_version.pyc
-PYSITELIB/Numeric/ranlib.so
-PYSITELIB/Numeric/umath.so
-PYSITELIB/PropertiedClasses/Properties.py
-PYSITELIB/PropertiedClasses/Properties.pyc
-PYSITELIB/PropertiedClasses/Properties_version.py
-PYSITELIB/PropertiedClasses/Properties_version.pyc
-PYSITELIB/PropertiedClasses/__init__.py
-PYSITELIB/PropertiedClasses/__init__.pyc
-PYSITELIB/RNG/RNG.so
-PYSITELIB/RNG/Statistics.py
-PYSITELIB/RNG/Statistics.pyc
-PYSITELIB/RNG/__init__.py
-PYSITELIB/RNG/__init__.pyc
-PYSITELIB/Numeric.pth
-PYSITELIB/kinds/__init__.py
-PYSITELIB/kinds/__init__.pyc
-PYSITELIB/kinds/_kinds.so
-PYSITELIB/kinds/kinds.py
-PYSITELIB/kinds/kinds.pyc
-PYSITELIB/kinds/kinds_version.py
-PYSITELIB/kinds/kinds_version.pyc
-@dirrm PYINC/Numeric
-@dirrm PYSITELIB/FFT
-@dirrm PYSITELIB/Numeric
-@dirrm PYSITELIB/MA
-@dirrm PYSITELIB/PropertiedClasses
-@dirrm PYSITELIB/RNG
-@dirrm PYSITELIB/kinds
+@comment $NetBSD: PLIST,v 1.8 2001/10/29 16:34:41 drochner Exp $
+${PYINC}/Numeric/arrayobject.h
+${PYINC}/Numeric/f2c.h
+${PYINC}/Numeric/ranlib.h
+${PYINC}/Numeric/ufuncobject.h
+${PYSITELIB}/FFT/FFT.py
+${PYSITELIB}/FFT/FFT.pyc
+${PYSITELIB}/FFT/__init__.py
+${PYSITELIB}/FFT/__init__.pyc
+${PYSITELIB}/FFT/fftpack.so
+${PYSITELIB}/MA/MA.py
+${PYSITELIB}/MA/MA.pyc
+${PYSITELIB}/MA/MA_version.py
+${PYSITELIB}/MA/MA_version.pyc
+${PYSITELIB}/MA/__init__.py
+${PYSITELIB}/MA/__init__.pyc
+${PYSITELIB}/Numeric/ArrayPrinter.py
+${PYSITELIB}/Numeric/ArrayPrinter.pyc
+${PYSITELIB}/Numeric/LinearAlgebra.py
+${PYSITELIB}/Numeric/LinearAlgebra.pyc
+${PYSITELIB}/Numeric/MLab.py
+${PYSITELIB}/Numeric/MLab.pyc
+${PYSITELIB}/Numeric/Matrix.py
+${PYSITELIB}/Numeric/Matrix.pyc
+${PYSITELIB}/Numeric/Numeric.py
+${PYSITELIB}/Numeric/Numeric.pyc
+${PYSITELIB}/Numeric/Precision.py
+${PYSITELIB}/Numeric/Precision.pyc
+${PYSITELIB}/Numeric/RandomArray.py
+${PYSITELIB}/Numeric/RandomArray.pyc
+${PYSITELIB}/Numeric/UserArray.py
+${PYSITELIB}/Numeric/UserArray.pyc
+${PYSITELIB}/Numeric/_numpy.so
+${PYSITELIB}/Numeric/arrayfns.so
+${PYSITELIB}/Numeric/lapack_lite.so
+${PYSITELIB}/Numeric/multiarray.so
+${PYSITELIB}/Numeric/numeric_version.py
+${PYSITELIB}/Numeric/numeric_version.pyc
+${PYSITELIB}/Numeric/ranlib.so
+${PYSITELIB}/Numeric/umath.so
+${PYSITELIB}/PropertiedClasses/Properties.py
+${PYSITELIB}/PropertiedClasses/Properties.pyc
+${PYSITELIB}/PropertiedClasses/Properties_version.py
+${PYSITELIB}/PropertiedClasses/Properties_version.pyc
+${PYSITELIB}/PropertiedClasses/__init__.py
+${PYSITELIB}/PropertiedClasses/__init__.pyc
+${PYSITELIB}/RNG/RNG.so
+${PYSITELIB}/RNG/Statistics.py
+${PYSITELIB}/RNG/Statistics.pyc
+${PYSITELIB}/RNG/__init__.py
+${PYSITELIB}/RNG/__init__.pyc
+${PYSITELIB}/Numeric.pth
+${PYSITELIB}/kinds/__init__.py
+${PYSITELIB}/kinds/__init__.pyc
+${PYSITELIB}/kinds/_kinds.so
+${PYSITELIB}/kinds/kinds.py
+${PYSITELIB}/kinds/kinds.pyc
+${PYSITELIB}/kinds/kinds_version.py
+${PYSITELIB}/kinds/kinds_version.pyc
+@dirrm ${PYINC}/Numeric
+@dirrm ${PYSITELIB}/FFT
+@dirrm ${PYSITELIB}/Numeric
+@dirrm ${PYSITELIB}/MA
+@dirrm ${PYSITELIB}/PropertiedClasses
+@dirrm ${PYSITELIB}/RNG
+@dirrm ${PYSITELIB}/kinds