2 files changed, 47 insertions, 56 deletions

diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index b1ccbf97bb8c..080bda5d3858 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -15,26 +15,15 @@ DISTNAME=	Numeric-${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYDISTUTILS}
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	lapack.3:${PORTSDIR}/math/lapack \
 		blas.2:${PORTSDIR}/math/lapack
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
+USE_PYTHON=	yes
 MAKE_ENV=	BLASLIBDIR=${LOCALBASE}/lib LAPACKLIBDIR=${LOCALBASE}/lib
-PLIST_SUB=	PYVERSION="python${PYVERSION}"
 
 DOCDIR=		${PREFIX}/share/doc/py-numeric
 EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
-PYVERSION!=	(python -c 'import string, sys; \
-			   print string.split(sys.version)[0][:3]') 2> /dev/null \
-			|| echo "1.5"
-
-.if ${PYVERSION} == "2.0"
-PYDISTUTILS=	${LOCALBASE}/lib/python${PYVERSION}/distutils/core.py:${PORTSDIR}/lang/python
-.else
-PYDISTUTILS=	${LOCALBASE}/lib/python${PYVERSION}/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils
-.endif
 
 post-install:
 	@${MKDIR} ${EXAMPLEDIR}
diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index 1eb96e6e474a..7e56bed68e31 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -1,41 +1,43 @@
-include/%%PYVERSION%%/Numeric/arrayobject.h
-include/%%PYVERSION%%/Numeric/ranlib.h
-include/%%PYVERSION%%/Numeric/ufuncobject.h
-lib/%%PYVERSION%%/site-packages/FFT/FFT.py
-lib/%%PYVERSION%%/site-packages/FFT/FFT.pyc
-lib/%%PYVERSION%%/site-packages/MA/MA.py
-lib/%%PYVERSION%%/site-packages/MA/MA.pyc
-lib/%%PYVERSION%%/site-packages/MA/__init__.py
-lib/%%PYVERSION%%/site-packages/MA/__init__.pyc
-lib/%%PYVERSION%%/site-packages/Numeric.pth
-lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.py
-lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.py
-lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/MLab.py
-lib/%%PYVERSION%%/site-packages/Numeric/MLab.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/Matrix.py
-lib/%%PYVERSION%%/site-packages/Numeric/Matrix.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/Numeric.py
-lib/%%PYVERSION%%/site-packages/Numeric/Numeric.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/Precision.py
-lib/%%PYVERSION%%/site-packages/Numeric/Precision.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.py
-lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/UserArray.py
-lib/%%PYVERSION%%/site-packages/Numeric/UserArray.pyc
-lib/%%PYVERSION%%/site-packages/Numeric/_numpy.so
-lib/%%PYVERSION%%/site-packages/Numeric/arrayfns.so
-lib/%%PYVERSION%%/site-packages/Numeric/lapack_lite.so
-lib/%%PYVERSION%%/site-packages/Numeric/multiarray.so
-lib/%%PYVERSION%%/site-packages/Numeric/ranlib.so
-lib/%%PYVERSION%%/site-packages/Numeric/umath.so
-lib/%%PYVERSION%%/site-packages/RNG/RNG.so
-lib/%%PYVERSION%%/site-packages/RNG/Statistics.py
-lib/%%PYVERSION%%/site-packages/RNG/Statistics.pyc
-lib/%%PYVERSION%%/site-packages/RNG/__init__.py
-lib/%%PYVERSION%%/site-packages/RNG/__init__.pyc
-lib/%%PYVERSION%%/site-packages/fftpack.so
+include/%%PYTHON_VERSION%%/Numeric/arrayobject.h
+include/%%PYTHON_VERSION%%/Numeric/ranlib.h
+include/%%PYTHON_VERSION%%/Numeric/ufuncobject.h
+lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.py
+lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/LinearAlgebra.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/LinearAlgebra.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/MLab.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/MLab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Matrix.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Matrix.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Numeric.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Numeric.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Precision.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Precision.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/RandomArray.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/RandomArray.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/UserArray.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/UserArray.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/_numpy.so
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/arrayfns.so
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/lapack_lite.so
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/multiarray.so
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/ranlib.so
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/umath.so
+lib/%%PYTHON_VERSION%%/site-packages/RNG/RNG.so
+lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.py
+lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.pyc
+lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/fftpack.so
 @unexec rmdir %B 2>/dev/null || true
 @comment share/doc/py-numeric/numpy.pdf
 share/examples/py-numeric/NumTut/__init__.py
@@ -49,8 +51,8 @@ share/examples/py-numeric/sieve.py
 @dirrm share/examples/py-numeric/NumTut
 @dirrm share/examples/py-numeric
 @comment @dirrm share/doc/py-numeric
-@dirrm lib/%%PYVERSION%%/site-packages/RNG
-@dirrm lib/%%PYVERSION%%/site-packages/Numeric
-@dirrm lib/%%PYVERSION%%/site-packages/MA
-@dirrm lib/%%PYVERSION%%/site-packages/FFT
-@dirrm include/%%PYVERSION%%/Numeric
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/RNG
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Numeric
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/MA
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/FFT
+@dirrm include/%%PYTHON_VERSION%%/Numeric