3 files changed, 90 insertions, 84 deletions

diff --git a/misc/py-distutils/Makefile b/misc/py-distutils/Makefile
index bde72c696b6f..35cf8746e43c 100644
--- a/misc/py-distutils/Makefile
+++ b/misc/py-distutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distutils
-PORTVERSION=	0.9
+PORTVERSION=	0.9.1
 CATEGORIES=	misc python
 MASTER_SITES=	http://www.python.org/sigs/distutils-sig/download/
 PKGNAMEPREFIX=	py-
@@ -17,6 +17,10 @@ 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]' || echo "1.5"
+
 do-build:
 	@(cd ${WRKSRC}; python setup.py build)
 
diff --git a/misc/py-distutils/distinfo b/misc/py-distutils/distinfo
index 5e0ab3be67d1..463ab1d9f108 100644
--- a/misc/py-distutils/distinfo
+++ b/misc/py-distutils/distinfo
@@ -1 +1 @@
-MD5 (Distutils-0.9.tar.gz) = 9e4d5597d1050bab58bcccd0eab375db
+MD5 (Distutils-0.9.1.tar.gz) = d6b30594e265afdad280bf91af795694
diff --git a/misc/py-distutils/pkg-plist b/misc/py-distutils/pkg-plist
index bef76c6700fd..6db1a81398bf 100644
--- a/misc/py-distutils/pkg-plist
+++ b/misc/py-distutils/pkg-plist
@@ -1,82 +1,84 @@
-lib/python1.5/site-packages/distutils/__init__.py
-lib/python1.5/site-packages/distutils/__init__.pyc
-lib/python1.5/site-packages/distutils/archive_util.py
-lib/python1.5/site-packages/distutils/archive_util.pyc
-lib/python1.5/site-packages/distutils/bcppcompiler.py
-lib/python1.5/site-packages/distutils/bcppcompiler.pyc
-lib/python1.5/site-packages/distutils/ccompiler.py
-lib/python1.5/site-packages/distutils/ccompiler.pyc
-lib/python1.5/site-packages/distutils/cmd.py
-lib/python1.5/site-packages/distutils/cmd.pyc
-lib/python1.5/site-packages/distutils/command/__init__.py
-lib/python1.5/site-packages/distutils/command/__init__.pyc
-lib/python1.5/site-packages/distutils/command/bdist.py
-lib/python1.5/site-packages/distutils/command/bdist.pyc
-lib/python1.5/site-packages/distutils/command/bdist_dumb.py
-lib/python1.5/site-packages/distutils/command/bdist_dumb.pyc
-lib/python1.5/site-packages/distutils/command/bdist_rpm.py
-lib/python1.5/site-packages/distutils/command/bdist_rpm.pyc
-lib/python1.5/site-packages/distutils/command/bdist_wininst.py
-lib/python1.5/site-packages/distutils/command/bdist_wininst.pyc
-lib/python1.5/site-packages/distutils/command/build.py
-lib/python1.5/site-packages/distutils/command/build.pyc
-lib/python1.5/site-packages/distutils/command/build_clib.py
-lib/python1.5/site-packages/distutils/command/build_clib.pyc
-lib/python1.5/site-packages/distutils/command/build_ext.py
-lib/python1.5/site-packages/distutils/command/build_ext.pyc
-lib/python1.5/site-packages/distutils/command/build_py.py
-lib/python1.5/site-packages/distutils/command/build_py.pyc
-lib/python1.5/site-packages/distutils/command/build_scripts.py
-lib/python1.5/site-packages/distutils/command/build_scripts.pyc
-lib/python1.5/site-packages/distutils/command/clean.py
-lib/python1.5/site-packages/distutils/command/clean.pyc
-lib/python1.5/site-packages/distutils/command/config.py
-lib/python1.5/site-packages/distutils/command/config.pyc
-lib/python1.5/site-packages/distutils/command/install.py
-lib/python1.5/site-packages/distutils/command/install.pyc
-lib/python1.5/site-packages/distutils/command/install_data.py
-lib/python1.5/site-packages/distutils/command/install_data.pyc
-lib/python1.5/site-packages/distutils/command/install_headers.py
-lib/python1.5/site-packages/distutils/command/install_headers.pyc
-lib/python1.5/site-packages/distutils/command/install_lib.py
-lib/python1.5/site-packages/distutils/command/install_lib.pyc
-lib/python1.5/site-packages/distutils/command/install_scripts.py
-lib/python1.5/site-packages/distutils/command/install_scripts.pyc
-lib/python1.5/site-packages/distutils/command/sdist.py
-lib/python1.5/site-packages/distutils/command/sdist.pyc
-lib/python1.5/site-packages/distutils/core.py
-lib/python1.5/site-packages/distutils/core.pyc
-lib/python1.5/site-packages/distutils/cygwinccompiler.py
-lib/python1.5/site-packages/distutils/cygwinccompiler.pyc
-lib/python1.5/site-packages/distutils/dep_util.py
-lib/python1.5/site-packages/distutils/dep_util.pyc
-lib/python1.5/site-packages/distutils/dir_util.py
-lib/python1.5/site-packages/distutils/dir_util.pyc
-lib/python1.5/site-packages/distutils/dist.py
-lib/python1.5/site-packages/distutils/dist.pyc
-lib/python1.5/site-packages/distutils/errors.py
-lib/python1.5/site-packages/distutils/errors.pyc
-lib/python1.5/site-packages/distutils/extension.py
-lib/python1.5/site-packages/distutils/extension.pyc
-lib/python1.5/site-packages/distutils/fancy_getopt.py
-lib/python1.5/site-packages/distutils/fancy_getopt.pyc
-lib/python1.5/site-packages/distutils/file_util.py
-lib/python1.5/site-packages/distutils/file_util.pyc
-lib/python1.5/site-packages/distutils/msvccompiler.py
-lib/python1.5/site-packages/distutils/msvccompiler.pyc
-lib/python1.5/site-packages/distutils/spawn.py
-lib/python1.5/site-packages/distutils/spawn.pyc
-lib/python1.5/site-packages/distutils/sysconfig.py
-lib/python1.5/site-packages/distutils/sysconfig.pyc
-lib/python1.5/site-packages/distutils/test.py
-lib/python1.5/site-packages/distutils/test.pyc
-lib/python1.5/site-packages/distutils/text_file.py
-lib/python1.5/site-packages/distutils/text_file.pyc
-lib/python1.5/site-packages/distutils/unixccompiler.py
-lib/python1.5/site-packages/distutils/unixccompiler.pyc
-lib/python1.5/site-packages/distutils/util.py
-lib/python1.5/site-packages/distutils/util.pyc
-lib/python1.5/site-packages/distutils/version.py
-lib/python1.5/site-packages/distutils/version.pyc
-@dirrm lib/python1.5/site-packages/distutils/command
-@dirrm lib/python1.5/site-packages/distutils
+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