2 files changed, 83 insertions, 90 deletions

diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index 149c64423705..fd9443503736 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -17,16 +17,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	A discovery-based unittest extension
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 MAN1=		nosetests.1
-NOSEVER?=	${PORTVERSION}
-PYTHONVER?=	${_PYTHON_VERSION}
-PLIST_SUB=	NOSEVER=${NOSEVER} \
-		PYTHONVER=${PYTHONVER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/nosetests.1 ${PREFIX}/man/man1
diff --git a/devel/py-nose/pkg-plist b/devel/py-nose/pkg-plist
index 8da956385be1..9c4a1286895e 100644
--- a/devel/py-nose/pkg-plist
+++ b/devel/py-nose/pkg-plist
@@ -1,83 +1,83 @@
 bin/nosetests
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%