Update to use bsd.python.mk.

2 files changed, 87 insertions, 94 deletions

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