8 files changed, 239 insertions, 268 deletions

diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index b1ccbf97bb8c..080bda5d3858 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/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/numpy/pkg-plist b/math/numpy/pkg-plist
index 1eb96e6e474a..7e56bed68e31 100644
--- a/math/numpy/pkg-plist
+++ b/math/numpy/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
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index b1ccbf97bb8c..080bda5d3858 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/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-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 1eb96e6e474a..7e56bed68e31 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/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
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
diff --git a/math/pygist/Makefile b/math/pygist/Makefile
index 5ab2489878a9..0c1e53c9573b 100644
--- a/math/pygist/Makefile
+++ b/math/pygist/Makefile
@@ -15,39 +15,37 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${LOCALBASE}/lib/yorick/1.4/lib/libgist.a:${PORTSDIR}/lang/yorick \
+BUILD_DEPENDS=	${LOCALBASE}/lib/yorick/1.4/lib/libgist.a:${PORTSDIR}/lang/yorick \
 		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
 		${RNGDIR}/RNG.so:${PORTSDIR}/math/numpy
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
+RUN_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
 		${RNGDIR}/RNG.so:${PORTSDIR}/math/numpy
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Graphics
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+USE_PYTHON=	yes
+CONFIGURE_ENV=	PREFIX=${PREFIX} PYTHON=${PYTHON_CMD}
 ALL_TARGET=	sharedmods
-MAKE_FLAGS+=	'OPT=${CFLAGS}'
+MAKE_FLAGS=	'OPT=${CFLAGS}'
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-GISTDIR=	${PYTHONSCRIPTDIR}/site-packages/PyGist
-NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/Numeric
-RNGDIR=		${PYTHONSCRIPTDIR}/site-packages/RNG
+GISTDIR=	${PYTHON_SITELIBDIR}/PyGist
+NUMPYDIR=	${PYTHON_SITELIBDIR}/Numeric
+RNGDIR=		${PYTHON_SITELIBDIR}/RNG
 EXAMPLEDIR=	${PREFIX}/share/examples/PyGist
 
 post-patch:
 .for file in Gist3D/Demo/demo5.py Gist3D/Demo/gistmeshtest.py \
 		Narcisse/Demo/meshtest.py OOG/Demo/eztest.py \
 		OOG/Demo/surftest3d.py OOG/Demo/surftest4d.py
-	${PERL} -pi -e 's/from Ranf import/from RNG import/' ${WRKSRC}/${file}
+	@${PERL} -pi -e 's/from Ranf import/from RNG import/' ${WRKSRC}/${file}
 .endfor
 
 do-configure:
-	@(cd ${WRKSRC} && ${CONFIGURE_ENV} python makethis.py)
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${PYTHON_CMD} makethis.py)
 
 post-install:
 	@${MKDIR} ${GISTDIR}
 	${INSTALL_DATA} ${WRKSRC}/*/Lib/* ${GISTDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${GISTDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${GISTDIR}
 	@${ECHO} "PyGist" > ${GISTDIR}/../PyGist.pth
 	${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/*/Demo/* ${EXAMPLEDIR}
diff --git a/math/pygist/pkg-plist b/math/pygist/pkg-plist
index a0e579fc45c3..4d415a42db44 100644
--- a/math/pygist/pkg-plist
+++ b/math/pygist/pkg-plist
@@ -1,90 +1,89 @@
-lib/python1.5/site-packages/PyGist/GistPlotter.py
-lib/python1.5/site-packages/PyGist/GistPlotter.pyc
-lib/python1.5/site-packages/PyGist/GistPlotter.pyo
-lib/python1.5/site-packages/PyGist/NarPlotter.py
-lib/python1.5/site-packages/PyGist/NarPlotter.pyc
-lib/python1.5/site-packages/PyGist/NarPlotter.pyo
-lib/python1.5/site-packages/PyGist/animation2d.py
-lib/python1.5/site-packages/PyGist/animation2d.pyc
-lib/python1.5/site-packages/PyGist/animation2d.pyo
-lib/python1.5/site-packages/PyGist/cellarray.py
-lib/python1.5/site-packages/PyGist/cellarray.pyc
-lib/python1.5/site-packages/PyGist/cellarray.pyo
-lib/python1.5/site-packages/PyGist/colorbar.py
-lib/python1.5/site-packages/PyGist/colorbar.pyc
-lib/python1.5/site-packages/PyGist/colorbar.pyo
-lib/python1.5/site-packages/PyGist/curve.py
-lib/python1.5/site-packages/PyGist/curve.pyc
-lib/python1.5/site-packages/PyGist/curve.pyo
-lib/python1.5/site-packages/PyGist/ezplot.py
-lib/python1.5/site-packages/PyGist/ezplot.pyc
-lib/python1.5/site-packages/PyGist/ezplot.pyo
-lib/python1.5/site-packages/PyGist/gist.help
-lib/python1.5/site-packages/PyGist/gist.py
-lib/python1.5/site-packages/PyGist/gist.pyc
-lib/python1.5/site-packages/PyGist/gist.pyo
-lib/python1.5/site-packages/PyGist/gist3dhelp.py
-lib/python1.5/site-packages/PyGist/gist3dhelp.pyc
-lib/python1.5/site-packages/PyGist/gist3dhelp.pyo
-lib/python1.5/site-packages/PyGist/graftypes.py
-lib/python1.5/site-packages/PyGist/graftypes.pyc
-lib/python1.5/site-packages/PyGist/graftypes.pyo
-lib/python1.5/site-packages/PyGist/graph.py
-lib/python1.5/site-packages/PyGist/graph.pyc
-lib/python1.5/site-packages/PyGist/graph.pyo
-lib/python1.5/site-packages/PyGist/graph2d.py
-lib/python1.5/site-packages/PyGist/graph2d.pyc
-lib/python1.5/site-packages/PyGist/graph2d.pyo
-lib/python1.5/site-packages/PyGist/graph3d.py
-lib/python1.5/site-packages/PyGist/graph3d.pyc
-lib/python1.5/site-packages/PyGist/graph3d.pyo
-lib/python1.5/site-packages/PyGist/help.help
-lib/python1.5/site-packages/PyGist/help.py
-lib/python1.5/site-packages/PyGist/help.pyc
-lib/python1.5/site-packages/PyGist/help.pyo
-lib/python1.5/site-packages/PyGist/lines.py
-lib/python1.5/site-packages/PyGist/lines.pyc
-lib/python1.5/site-packages/PyGist/lines.pyo
-lib/python1.5/site-packages/PyGist/mesh3d.py
-lib/python1.5/site-packages/PyGist/mesh3d.pyc
-lib/python1.5/site-packages/PyGist/mesh3d.pyo
-lib/python1.5/site-packages/PyGist/movie.py
-lib/python1.5/site-packages/PyGist/movie.pyc
-lib/python1.5/site-packages/PyGist/movie.pyo
-lib/python1.5/site-packages/PyGist/pl3d.py
-lib/python1.5/site-packages/PyGist/pl3d.pyc
-lib/python1.5/site-packages/PyGist/pl3d.pyo
-lib/python1.5/site-packages/PyGist/plane.py
-lib/python1.5/site-packages/PyGist/plane.pyc
-lib/python1.5/site-packages/PyGist/plane.pyo
-lib/python1.5/site-packages/PyGist/plwf.py
-lib/python1.5/site-packages/PyGist/plwf.pyc
-lib/python1.5/site-packages/PyGist/plwf.pyo
-lib/python1.5/site-packages/PyGist/polymap.py
-lib/python1.5/site-packages/PyGist/polymap.pyc
-lib/python1.5/site-packages/PyGist/polymap.pyo
-lib/python1.5/site-packages/PyGist/quadmesh.py
-lib/python1.5/site-packages/PyGist/quadmesh.pyc
-lib/python1.5/site-packages/PyGist/quadmesh.pyo
-lib/python1.5/site-packages/PyGist/region.py
-lib/python1.5/site-packages/PyGist/region.pyc
-lib/python1.5/site-packages/PyGist/region.pyo
-lib/python1.5/site-packages/PyGist/shapetest.py
-lib/python1.5/site-packages/PyGist/shapetest.pyc
-lib/python1.5/site-packages/PyGist/shapetest.pyo
-lib/python1.5/site-packages/PyGist/slice3.py
-lib/python1.5/site-packages/PyGist/slice3.pyc
-lib/python1.5/site-packages/PyGist/slice3.pyo
-lib/python1.5/site-packages/PyGist/surface.py
-lib/python1.5/site-packages/PyGist/surface.pyc
-lib/python1.5/site-packages/PyGist/surface.pyo
-lib/python1.5/site-packages/PyGist/yorick.py
-lib/python1.5/site-packages/PyGist/yorick.pyc
-lib/python1.5/site-packages/PyGist/yorick.pyo
-@dirrm lib/python1.5/site-packages/PyGist
-lib/python1.5/site-packages/PyGist.pth
-lib/python1.5/site-packages/arrayfnsmodule.so
-lib/python1.5/site-packages/gistCmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/GistPlotter.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/GistPlotter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/GistPlotter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/NarPlotter.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/NarPlotter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/NarPlotter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/animation2d.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/animation2d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/animation2d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/cellarray.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/cellarray.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/cellarray.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/colorbar.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/colorbar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/colorbar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/curve.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/curve.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/curve.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/ezplot.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/ezplot.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/ezplot.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist.help
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist3dhelp.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist3dhelp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/gist3dhelp.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graftypes.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graftypes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graftypes.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph2d.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph2d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph2d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph3d.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph3d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/graph3d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/help.help
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/help.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/help.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/help.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/lines.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/lines.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/lines.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/mesh3d.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/mesh3d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/mesh3d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/movie.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/movie.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/movie.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/pl3d.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/pl3d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/pl3d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plane.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plane.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plane.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plwf.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plwf.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/plwf.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/polymap.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/polymap.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/polymap.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/quadmesh.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/quadmesh.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/quadmesh.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/region.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/region.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/region.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/shapetest.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/shapetest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/shapetest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/slice3.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/slice3.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/slice3.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/surface.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/surface.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/surface.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/yorick.py
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/yorick.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PyGist/yorick.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PyGist.pth
+lib/%%PYTHON_VERSION%%/site-packages/arrayfnsmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/gistCmodule.so
 share/examples/PyGist/berts.py
 share/examples/PyGist/berts.pyc
 share/examples/PyGist/bills.py
@@ -120,3 +119,4 @@ share/examples/PyGist/twograftest2d.pyc
 share/examples/PyGist/z_nobox.gs
 share/examples/PyGist/z_work.gs
 @dirrm share/examples/PyGist
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/PyGist