3 files changed, 9 insertions, 168 deletions

diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 0c694ffd8f64..0ef0db7ba200 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	stevedore
 PORTVERSION=	0.11
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,6 @@ COMMENT=	Manage dynamic plugins for Python applications
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}argparse>=1.1:${PORTSDIR}/devel/py-argparse
 TEST_DEPENDS=	${PKGNAMEPREFIX}coverage>=3.5.3:${PORTSDIR}/devel/py-coverage \
 		${PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock \
 		${PKGNAMEPREFIX}nose>=1.3.0:${PORTSDIR}/devel/py-nose \
@@ -24,23 +23,22 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 TOX_CMD=	${LOCALBASE}/bin/tox
 
-# Python3 ready
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
 		sphinx-build:${PORTSDIR}/textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	*
 PYDISTUTILS_BUILD_TARGET+=	build_sphinx --all-files --fresh-env
 
 post-install:
-	@cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
 
 regression-test: build
@@ -50,8 +48,4 @@ regression-test: build
 		-e 's,%%WRKSRC%%,${WRKSRC},1' -i.bak tox.ini && \
 	${TOX_CMD}
 
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-stevedore/pkg-descr b/devel/py-stevedore/pkg-descr
index 8626ee3e5865..65d0f6dae85e 100644
--- a/devel/py-stevedore/pkg-descr
+++ b/devel/py-stevedore/pkg-descr
@@ -5,4 +5,4 @@ for doing this, using __import__ or importlib. Stevedore avoids
 creating yet another extension mechanism by building on top of setuptools
 entry points.
 
-WWW: https://github.com/dreamhost/stevedore
+WWW: https://github.com/dreamhost/stevedore/
diff --git a/devel/py-stevedore/pkg-plist b/devel/py-stevedore/pkg-plist
deleted file mode 100644
index 5dfec10fba89..000000000000
--- a/devel/py-stevedore/pkg-plist
+++ /dev/null
@@ -1,153 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/dispatch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/dispatch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/dispatch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/driver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/driver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/driver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/enabled.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/enabled.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/enabled.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/fields.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/fields.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/fields.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_driver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_driver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_driver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_extension.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_extension.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/load_as_extension.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/simple.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/simple.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example/simple.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/extension.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/extension.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/extension.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/hook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/hook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/hook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/named.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/named.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/named.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/manager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/manager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/manager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_dispatch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_dispatch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_dispatch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_driver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_driver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_driver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_enabled.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_enabled.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_enabled.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_fields.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_fields.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_fields.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_simple.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_simple.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_example_simple.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_extension.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_extension.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_extension.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_hook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_hook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_hook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_named.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_named.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests/test_named.pyo
-%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
-%%PORTDOCS%%%%DOCSDIR%%/_images/ceilometer-design.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_images/discovery.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_images/enabling.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-08fe6220bc1dbd26a74e2669d53a297aa22af2f3.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-08fe6220bc1dbd26a74e2669d53a297aa22af2f3.png.map
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-3af069098c975cf4ccc9b878bd4ecfce2f485b8b.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-3af069098c975cf4ccc9b878bd4ecfce2f485b8b.png.map
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-c58c2e8e4126e434dc2251649dea48f116f08b19.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/graphviz-c58c2e8e4126e434dc2251649dea48f116f08b19.png.map
-%%PORTDOCS%%%%DOCSDIR%%/_images/importing.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_images/integration.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_images/invocation.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_sources/essays/pycon2013.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/install.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/managers.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/patterns_enabling.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/patterns_loading.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial/creating_plugins.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial/loading.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial/naming.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial/testing.txt
-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
-%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/default.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/sidebar.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/essays/pycon2013.html
-%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%PORTDOCS%%%%DOCSDIR%%/history.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/managers.html
-%%PORTDOCS%%%%DOCSDIR%%/objects.inv
-%%PORTDOCS%%%%DOCSDIR%%/patterns_enabling.html
-%%PORTDOCS%%%%DOCSDIR%%/patterns_loading.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/creating_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/loading.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/naming.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/testing.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/essays
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources/essays
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore/example
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/stevedore
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%