Update to use bsd.python.mk.

14 files changed, 342 insertions, 416 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
diff --git a/misc/py-distutils/Makefile b/misc/py-distutils/Makefile
index c72770de15dc..e1ab0a4f40b4 100644
--- a/misc/py-distutils/Makefile
+++ b/misc/py-distutils/Makefile
@@ -14,19 +14,12 @@ DISTNAME=	Distutils-${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-
-PLIST_SUB=	PYVERSION="python${PYVERSION}"
-
-PYVERSION!=	(python -c 'import string, sys; \
-				print string.split(sys.version)[0][:3]') 2> /dev/null \
-		|| echo "1.5"
+USE_PYTHON=	yes
 
 do-build:
-	@(cd ${WRKSRC}; python setup.py build)
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)
 
 do-install:
-	@(cd ${WRKSRC}; python setup.py install)
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)
 
 .include <bsd.port.mk>
diff --git a/misc/py-distutils/pkg-plist b/misc/py-distutils/pkg-plist
index 6db1a81398bf..f3e5a976dbd1 100644
--- a/misc/py-distutils/pkg-plist
+++ b/misc/py-distutils/pkg-plist
@@ -1,84 +1,84 @@
-lib/%%PYVERSION%%/site-packages/distutils/__init__.py
-lib/%%PYVERSION%%/site-packages/distutils/__init__.pyc
-lib/%%PYVERSION%%/site-packages/distutils/archive_util.py
-lib/%%PYVERSION%%/site-packages/distutils/archive_util.pyc
-lib/%%PYVERSION%%/site-packages/distutils/bcppcompiler.py
-lib/%%PYVERSION%%/site-packages/distutils/bcppcompiler.pyc
-lib/%%PYVERSION%%/site-packages/distutils/ccompiler.py
-lib/%%PYVERSION%%/site-packages/distutils/ccompiler.pyc
-lib/%%PYVERSION%%/site-packages/distutils/cmd.py
-lib/%%PYVERSION%%/site-packages/distutils/cmd.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/__init__.py
-lib/%%PYVERSION%%/site-packages/distutils/command/__init__.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist.py
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_dumb.py
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_dumb.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_rpm.py
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_rpm.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_wininst.py
-lib/%%PYVERSION%%/site-packages/distutils/command/bdist_wininst.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/build.py
-lib/%%PYVERSION%%/site-packages/distutils/command/build.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/build_clib.py
-lib/%%PYVERSION%%/site-packages/distutils/command/build_clib.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/build_ext.py
-lib/%%PYVERSION%%/site-packages/distutils/command/build_ext.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/build_py.py
-lib/%%PYVERSION%%/site-packages/distutils/command/build_py.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/build_scripts.py
-lib/%%PYVERSION%%/site-packages/distutils/command/build_scripts.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/clean.py
-lib/%%PYVERSION%%/site-packages/distutils/command/clean.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/config.py
-lib/%%PYVERSION%%/site-packages/distutils/command/config.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/install.py
-lib/%%PYVERSION%%/site-packages/distutils/command/install.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/install_data.py
-lib/%%PYVERSION%%/site-packages/distutils/command/install_data.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/install_headers.py
-lib/%%PYVERSION%%/site-packages/distutils/command/install_headers.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/install_lib.py
-lib/%%PYVERSION%%/site-packages/distutils/command/install_lib.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/install_scripts.py
-lib/%%PYVERSION%%/site-packages/distutils/command/install_scripts.pyc
-lib/%%PYVERSION%%/site-packages/distutils/command/sdist.py
-lib/%%PYVERSION%%/site-packages/distutils/command/sdist.pyc
-lib/%%PYVERSION%%/site-packages/distutils/core.py
-lib/%%PYVERSION%%/site-packages/distutils/core.pyc
-lib/%%PYVERSION%%/site-packages/distutils/cygwinccompiler.py
-lib/%%PYVERSION%%/site-packages/distutils/cygwinccompiler.pyc
-lib/%%PYVERSION%%/site-packages/distutils/dep_util.py
-lib/%%PYVERSION%%/site-packages/distutils/dep_util.pyc
-lib/%%PYVERSION%%/site-packages/distutils/dir_util.py
-lib/%%PYVERSION%%/site-packages/distutils/dir_util.pyc
-lib/%%PYVERSION%%/site-packages/distutils/dist.py
-lib/%%PYVERSION%%/site-packages/distutils/dist.pyc
-lib/%%PYVERSION%%/site-packages/distutils/errors.py
-lib/%%PYVERSION%%/site-packages/distutils/errors.pyc
-lib/%%PYVERSION%%/site-packages/distutils/extension.py
-lib/%%PYVERSION%%/site-packages/distutils/extension.pyc
-lib/%%PYVERSION%%/site-packages/distutils/fancy_getopt.py
-lib/%%PYVERSION%%/site-packages/distutils/fancy_getopt.pyc
-lib/%%PYVERSION%%/site-packages/distutils/file_util.py
-lib/%%PYVERSION%%/site-packages/distutils/file_util.pyc
-lib/%%PYVERSION%%/site-packages/distutils/filelist.py
-lib/%%PYVERSION%%/site-packages/distutils/filelist.pyc
-lib/%%PYVERSION%%/site-packages/distutils/msvccompiler.py
-lib/%%PYVERSION%%/site-packages/distutils/msvccompiler.pyc
-lib/%%PYVERSION%%/site-packages/distutils/spawn.py
-lib/%%PYVERSION%%/site-packages/distutils/spawn.pyc
-lib/%%PYVERSION%%/site-packages/distutils/sysconfig.py
-lib/%%PYVERSION%%/site-packages/distutils/sysconfig.pyc
-lib/%%PYVERSION%%/site-packages/distutils/test.py
-lib/%%PYVERSION%%/site-packages/distutils/test.pyc
-lib/%%PYVERSION%%/site-packages/distutils/text_file.py
-lib/%%PYVERSION%%/site-packages/distutils/text_file.pyc
-lib/%%PYVERSION%%/site-packages/distutils/unixccompiler.py
-lib/%%PYVERSION%%/site-packages/distutils/unixccompiler.pyc
-lib/%%PYVERSION%%/site-packages/distutils/util.py
-lib/%%PYVERSION%%/site-packages/distutils/util.pyc
-lib/%%PYVERSION%%/site-packages/distutils/version.py
-lib/%%PYVERSION%%/site-packages/distutils/version.pyc
-@dirrm lib/%%PYVERSION%%/site-packages/distutils/command
-@dirrm lib/%%PYVERSION%%/site-packages/distutils
+lib/%%PYTHON_VERSION%%/site-packages/distutils/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/archive_util.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/archive_util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/bcppcompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/bcppcompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/ccompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/ccompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/cmd.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/cmd.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_dumb.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_dumb.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_rpm.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_rpm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_wininst.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/bdist_wininst.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_clib.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_clib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_ext.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_ext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_py.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_py.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_scripts.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/build_scripts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/clean.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/clean.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/config.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_data.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_data.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_headers.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_headers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_lib.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_lib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_scripts.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/install_scripts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/sdist.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/command/sdist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/core.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/core.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/cygwinccompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/cygwinccompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dep_util.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dep_util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dir_util.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dir_util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dist.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/dist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/errors.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/errors.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/extension.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/extension.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/fancy_getopt.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/fancy_getopt.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/file_util.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/file_util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/filelist.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/filelist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/msvccompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/msvccompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/spawn.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/spawn.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/sysconfig.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/sysconfig.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/test.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/test.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/text_file.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/text_file.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/unixccompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/unixccompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/util.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/distutils/version.py
+lib/%%PYTHON_VERSION%%/site-packages/distutils/version.pyc
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/distutils/command
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/distutils
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index f3458be5151a..6b8ed9dabbdf 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -5,35 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-tkinter
-PORTVERSION= 	1.5.2
+PORTNAME=	tkinter
+PORTVERSION= 	${PYTHON_PORTVERSION}
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
-DISTNAME=	py152
-EXTRACT_SUFX=	.tgz
+PKGNAMEPREFIX=	py-
+DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
 DIST_SUBDIR=	python
-WRKSRC=		${WRKDIR}/Python-1.5.2/Modules
+USE_PYTHON=	yes
+WRKSRC=		${PYTHON_WRKSRC}/Modules
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-
 post-extract:
 	@${CP} ${FILESDIR}/Setup ${WRKSRC}
-	@${CP} ${PYTHONSCRIPTDIR}/config/Makefile.pre.in ${WRKSRC}
+	@${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
 
 do-configure:
-	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC}; \
+		${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PYTHONSCRIPTDIR}/site-packages
+	${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-tkinter/distinfo b/x11-toolkits/py-tkinter/distinfo
index 72ca6a75cf6c..9f240a38aab8 100644
--- a/x11-toolkits/py-tkinter/distinfo
+++ b/x11-toolkits/py-tkinter/distinfo
@@ -1 +1,3 @@
 MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
+MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
+MD5 (python/BeOpen-Python-2.0b1.tar.gz) = ad8b95886e5049fc9c79a50f4ea3debf
diff --git a/x11-toolkits/py-tkinter/files/Setup b/x11-toolkits/py-tkinter/files/Setup
index d0c27c930ba2..6a90582bf2da 100644
--- a/x11-toolkits/py-tkinter/files/Setup
+++ b/x11-toolkits/py-tkinter/files/Setup
@@ -5,43 +5,4 @@
 # The TKPATH variable is always enabled, to save you the effort.
 TKPATH=:lib-tk
 
-# The command for _tkinter is long and site specific.  Please
-# uncomment and/or edit those parts as indicated.  If you don't have a
-# specific extension (e.g. Tix or BLT), leave the corresponding line
-# commented out.  (Leave the trailing backslashes in!  If you
-# experience strange errors, you may want to join all uncommented
-# lines and remove the backslashes -- the backslash interpretation is
-# done by the shell's "read" command and it may not be implemented on
-# every system.
-
-# *** Always uncomment this (leave the leading underscore in!):
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 -L${PREFIX}/lib -ltk82 -ltcl82 -L${X11BASE}/lib -lX11
-
-# *** Uncommend and edit to reflect where your X11 header files are:
-#	-I/usr/X11R6/include \
-# *** Or uncomment this for Solaris:
-#	-I/usr/openwin/include \
-# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-#	-I/usr/local/include/tcl8.1 -I/usr/local/include/tk8.1 \
-# *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix4.1.8.0 \
-# *** Uncomment and edit for BLT extension only:
-#	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
-# *** Uncomment and edit for PIL (TkImaging) extension only:
-#	-DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-# *** Uncomment and edit for Mesa (what's Mesa?):
-#	-lGL -lGLU -lMesatk -lMesaaux \
-# *** Uncomment and edit for TOGL extension only:
-#	-DWITH_TOGL togl.c \
-# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
-#	-L/usr/local/lib \
-# *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk80 -ltcl80 \
-# *** Uncomment and edit to reflect where your X11 libraries are:
-#	-L/usr/X11R6/lib \
-# *** Or uncomment this for Solaris:
-#	-L/usr/openwin/lib \
-# *** Always uncomment this; X11 libraries to link with:
-#	-lX11 -lXext -lXmu
-
-
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3 -L${PREFIX}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11
diff --git a/x11-toolkits/py-tkinter/pkg-plist b/x11-toolkits/py-tkinter/pkg-plist
index b8deafa6c8f2..84452c3628ba 100644
--- a/x11-toolkits/py-tkinter/pkg-plist
+++ b/x11-toolkits/py-tkinter/pkg-plist
@@ -1 +1 @@
-lib/python1.5/site-packages/_tkinter.so
+lib/%%PYTHON_VERSION%%/site-packages/_tkinter.so