32 files changed, 51 insertions, 489 deletions

diff --git a/devel/py-Breve/Makefile b/devel/py-Breve/Makefile
index 38b6133a770c..b108a0cd473b 100644
--- a/devel/py-Breve/Makefile
+++ b/devel/py-Breve/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Breve
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://breve.twisty-industries.com/downloads/ \
 		LOCAL/nivit/${PORTNAME}
@@ -13,7 +13,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Python s-expression style template engine
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-Breve/pkg-plist b/devel/py-Breve/pkg-plist
deleted file mode 100644
index 508ebfa1c5f7..000000000000
--- a/devel/py-Breve/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/breve_server
-bin/html2breve
-bin/soup2breve
-bin/xsd2breve
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-ctags/Makefile b/devel/py-ctags/Makefile
index dc4834cc6141..9d9da88a787c 100644
--- a/devel/py-ctags/Makefile
+++ b/devel/py-ctags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ctags
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,6 @@ COMMENT=	Python bindings for ctags index file
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	python-ctags
-PYDISTUTILS_PKGVERSION=	1.0.5
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-ctags/pkg-plist b/devel/py-ctags/pkg-plist
deleted file mode 100644
index 54ed4e62a4bf..000000000000
--- a/devel/py-ctags/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%PYTHON_SITELIBDIR%%/ctags/__init__.py
-%%PYTHON_SITELIBDIR%%/ctags/_readtags.so
-%%PYTHON_SITELIBDIR%%/ctags/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ctags/__init__.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/ctags
diff --git a/devel/py-dirspec/Makefile b/devel/py-dirspec/Makefile
index 9b27a572119b..6bbfcbd8ea50 100644
--- a/devel/py-dirspec/Makefile
+++ b/devel/py-dirspec/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dirspec
 PORTVERSION=	13.05
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/141027576/ \
 		http://nivit.altervista.org/FreeBSD/ports/distfiles/
@@ -15,7 +15,7 @@ COMMENT=	XDG Base and User directories implementation
 LICENSE=	GPLv3
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-dirspec/pkg-plist b/devel/py-dirspec/pkg-plist
deleted file mode 100644
index 1cf5f44f7a38..000000000000
--- a/devel/py-dirspec/pkg-plist
+++ /dev/null
@@ -1,17 +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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/basedir.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/basedir.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/basedir.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dirspec
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-flexmock/Makefile b/devel/py-flexmock/Makefile
index 020c9dfee4bf..21ebeca01ca1 100644
--- a/devel/py-flexmock/Makefile
+++ b/devel/py-flexmock/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flexmock
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,6 +13,6 @@ COMMENT=	Flexmock is a mock/stub/spy library for Python
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-flexmock/pkg-plist b/devel/py-flexmock/pkg-plist
deleted file mode 100644
index 9e5d7c3f1ccb..000000000000
--- a/devel/py-flexmock/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/flexmock.py
-%%PYTHON_SITELIBDIR%%/flexmock.pyc
-%%PYTHON_SITELIBDIR%%/flexmock.pyo
diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile
index 0bc9b9f90c84..88956eace535 100644
--- a/devel/py-glob2/Makefile
+++ b/devel/py-glob2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	glob2
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,7 @@ COMMENT=	Glob that captures patterns and supports recursive wildcards
 LICENSE=	BSD
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 985fd020663d..41e8a0cd9488 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kazoo
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,9 +18,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 
 USE_PYTHON=	yes
 USE_ZIP=	yes
-USE_PYDISTUTILS=easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USES=		gmake
 
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-kazoo/pkg-plist b/devel/py-kazoo/pkg-plist
deleted file mode 100644
index eaa764177d4f..000000000000
--- a/devel/py-kazoo/pkg-plist
+++ /dev/null
@@ -1,155 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/hosts.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/retry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/hosts.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/retry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/hosts.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/retry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/gevent.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/gevent.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/gevent.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/threading.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/threading.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/threading.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/paths.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/serialization.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/states.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/paths.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/serialization.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/states.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/paths.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/serialization.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol/states.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/barrier.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/counter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/election.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/lock.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/partitioner.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/party.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/queue.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/watchers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/barrier.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/counter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/election.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/lock.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/partitioner.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/party.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/queue.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/watchers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/barrier.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/counter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/election.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/lock.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/partitioner.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/party.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/queue.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe/watchers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/common.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/harness.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/common.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/harness.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/common.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing/harness.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_barrier.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_build.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_counter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_election.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_gevent_handler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_lock.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_partitioner.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_party.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_paths.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_queue.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_retry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_threading_handler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_watchers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_barrier.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_build.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_counter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_election.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_gevent_handler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_lock.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_partitioner.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_party.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_paths.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_queue.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_retry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_threading_handler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_watchers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_barrier.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_build.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_counter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_election.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_gevent_handler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_lock.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_partitioner.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_party.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_paths.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_queue.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_retry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_threading_handler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/test_watchers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests/util.pyo
-%%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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/handlers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/protocol
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/recipe
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/testing
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kazoo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/
diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile
index 561c75fad9a0..56d6b36c8964 100644
--- a/devel/py-parsedatetime/Makefile
+++ b/devel/py-parsedatetime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	parsedatetime
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,6 @@ COMMENT=	Python module for parsing 'human readable' date/time expressions
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-
-NO_STAGE=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-parsedatetime/pkg-plist b/devel/py-parsedatetime/pkg-plist
deleted file mode 100644
index 75cda7aeed40..000000000000
--- a/devel/py-parsedatetime/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-%%PYTHON_SITELIBDIR%%/parsedatetime/__init__.py
-%%PYTHON_SITELIBDIR%%/parsedatetime/__init__.pyc
-%%PYTHON_SITELIBDIR%%/parsedatetime/__init__.pyo
-%%PYTHON_SITELIBDIR%%/parsedatetime/parsedatetime.py
-%%PYTHON_SITELIBDIR%%/parsedatetime/parsedatetime.pyc
-%%PYTHON_SITELIBDIR%%/parsedatetime/parsedatetime.pyo
-%%PYTHON_SITELIBDIR%%/parsedatetime/pdt_locales.py
-%%PYTHON_SITELIBDIR%%/parsedatetime/pdt_locales.pyc
-%%PYTHON_SITELIBDIR%%/parsedatetime/pdt_locales.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/parsedatetime
diff --git a/devel/py-pycalendar/Makefile b/devel/py-pycalendar/Makefile
index 144d95ebc8b5..12d9b6317462 100644
--- a/devel/py-pycalendar/Makefile
+++ b/devel/py-pycalendar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pycalendar
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,11 +12,9 @@ MAINTAINER=	roland@micite.net
 COMMENT=	An iCalendar and vCard module for python
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|distutils.core|setuptools|g' ${WRKSRC}/setup.py
 
diff --git a/devel/py-pyxml2obj/Makefile b/devel/py-pyxml2obj/Makefile
index 7c78af33add6..84cfa1d5b3c6 100644
--- a/devel/py-pyxml2obj/Makefile
+++ b/devel/py-pyxml2obj/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pyxml2obj
 PORTVERSION=	0.1.2.9
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,7 @@ COMMENT=	Simple way to convert xml to python object and vice versa
 LICENSE=	MIT
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-serpent/Makefile b/devel/py-serpent/Makefile
index 515941dbe763..c013381394e6 100644
--- a/devel/py-serpent/Makefile
+++ b/devel/py-serpent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	serpent
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,16 +14,6 @@ LICENSE=	MIT
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST	=yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/serpent.py \
-		%%PYTHON_SITELIBDIR%%/serpent.pyc \
-		%%PYTHON_SITELIBDIR%%/serpent.pyo
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.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-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index 0800d35479bf..93e5bfc7f871 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	subvertpy
 PORTVERSION=	0.8.10
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/90814723/ \
 		http://www.c-s.li/ports/
@@ -18,10 +19,6 @@ BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	subvertpy
-
-NO_STAGE=	yes
-#post-patch:
-#		@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/setup.py
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-subvertpy/pkg-plist b/devel/py-subvertpy/pkg-plist
deleted file mode 100644
index 5f440fa55471..000000000000
--- a/devel/py-subvertpy/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/subvertpy-fast-export
-%%PYTHON_SITELIBDIR%%/subvertpy/__init__.py
-%%PYTHON_SITELIBDIR%%/subvertpy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/_ra.so
-%%PYTHON_SITELIBDIR%%/subvertpy/client.so
-%%PYTHON_SITELIBDIR%%/subvertpy/delta.py
-%%PYTHON_SITELIBDIR%%/subvertpy/delta.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/delta.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/marshall.py
-%%PYTHON_SITELIBDIR%%/subvertpy/marshall.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/marshall.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/properties.py
-%%PYTHON_SITELIBDIR%%/subvertpy/properties.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/properties.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/ra.py
-%%PYTHON_SITELIBDIR%%/subvertpy/ra.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/ra.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/ra_svn.py
-%%PYTHON_SITELIBDIR%%/subvertpy/ra_svn.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/ra_svn.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/repos.so
-%%PYTHON_SITELIBDIR%%/subvertpy/server.py
-%%PYTHON_SITELIBDIR%%/subvertpy/server.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/server.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_client.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_client.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_client.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_core.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_core.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_core.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_delta.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_delta.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_delta.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_marshall.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_marshall.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_marshall.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_properties.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_properties.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_properties.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_ra.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_ra.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_ra.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_repos.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_repos.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_repos.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_server.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_server.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_server.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_wc.py
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_wc.pyc
-%%PYTHON_SITELIBDIR%%/subvertpy/tests/test_wc.pyo
-%%PYTHON_SITELIBDIR%%/subvertpy/wc.so
-@dirrm %%PYTHON_SITELIBDIR%%/subvertpy/tests
-@dirrm %%PYTHON_SITELIBDIR%%/subvertpy
diff --git a/devel/py-termcolor/Makefile b/devel/py-termcolor/Makefile
index 03190f6702b4..b4a787aed461 100644
--- a/devel/py-termcolor/Makefile
+++ b/devel/py-termcolor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	termcolor
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	ANSII Color formatting for output in terminal
 LICENSE=	MIT
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-termcolor/pkg-plist b/devel/py-termcolor/pkg-plist
deleted file mode 100644
index 829b6b80eb35..000000000000
--- a/devel/py-termcolor/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/termcolor.py
-%%PYTHON_SITELIBDIR%%/termcolor.pyc
-%%PYTHON_SITELIBDIR%%/termcolor.pyo
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index c4c69d163aee..889650bef652 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	TestGears
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 		http://www.turbogears.org/download/eggs/
@@ -12,7 +13,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module to run tests written as simple functions
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-testgears/pkg-plist b/devel/py-testgears/pkg-plist
deleted file mode 100644
index ddf68a1c022f..000000000000
--- a/devel/py-testgears/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-trace2html/Makefile b/devel/py-trace2html/Makefile
index c1456bb23201..db7bbd696509 100644
--- a/devel/py-trace2html/Makefile
+++ b/devel/py-trace2html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	trace2html
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +14,7 @@ COMMENT=	HTML coverage report generator for trace.py
 LICENSE=	GPLv2
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_FILES=	bin/trace2html.py \
-		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index b68849237b81..360dae71bd08 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wheel
 PORTVERSION=	0.21.0
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,8 @@ COMMENT=	Built-package format for Python
 
 LICENSE=	MIT
 
-USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_AUTOPLIST=	yes
+USE_PYDISTUTILS=	yes
 # Python 3 ready
 USE_PYTHON=	yes
 
@@ -39,8 +40,4 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec
 		${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring
 .endif
 
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/devel/py-wheel/pkg-plist b/devel/py-wheel/pkg-plist
deleted file mode 100644
index 01782df992d8..000000000000
--- a/devel/py-wheel/pkg-plist
+++ /dev/null
@@ -1,121 +0,0 @@
-bin/egg2wheel
-bin/wheel
-bin/wininst2wheel
-%%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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__main__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__main__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/__main__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/archive.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/archive.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/archive.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/bdist_wheel.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/bdist_wheel.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/bdist_wheel.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/decorator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/egg2wheel.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/egg2wheel.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/egg2wheel.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/eggnames.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/install.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/install.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/install.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/metadata.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/metadata.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/metadata.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/paths.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/paths.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/paths.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pep425tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pep425tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pep425tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pkginfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pkginfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/pkginfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/djbec.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/djbec.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/djbec.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/ed25519py.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/ed25519py.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/ed25519py.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/keys.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/keys.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures/keys.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/complexdist/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/complexdist/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/complexdist/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/headersdist.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/headersdist.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/headersdist.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/simpledist/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/simpledist/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/simpledist/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_basic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_basic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_basic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_install.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_install.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_install.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_keys.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_keys.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_keys.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_paths.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_paths.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_paths.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_ranking.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_ranking.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_ranking.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_signatures.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_signatures.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_signatures.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_tool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_tool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_tool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_wheelfile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_wheelfile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/test_wheelfile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/tool/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/tool/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/tool/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/wininst2wheel.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/wininst2wheel.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/wininst2wheel.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/tool
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist/simpledist
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/simple.dist
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/headers.dist
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist/complexdist
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test/complex-dist
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/test
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel/signatures
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wheel
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-wsgi_xmlrpc/Makefile b/devel/py-wsgi_xmlrpc/Makefile
index 39484e31b2d8..a345281913c3 100644
--- a/devel/py-wsgi_xmlrpc/Makefile
+++ b/devel/py-wsgi_xmlrpc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wsgi_xmlrpc
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +15,7 @@ COMMENT=	WSGI application for a simple XMLRPC method dispatching
 LICENSE=	APACHE20
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index 70ed39e15607..a51553a5ed65 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wsgitools
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subdivi.de/~helmut/darcs/${PORTNAME}/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Useful middlewares and filters for wsgi as well as scgi servers
 LICENSE=	GPLv2                    # or higher
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-wsgitools/pkg-plist b/devel/py-wsgitools/pkg-plist
deleted file mode 100644
index 7f99e76ae7ba..000000000000
--- a/devel/py-wsgitools/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-%%PYTHON_SITELIBDIR%%/wsgitools/__init__.py
-%%PYTHON_SITELIBDIR%%/wsgitools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/adapters.py
-%%PYTHON_SITELIBDIR%%/wsgitools/adapters.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/adapters.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/authentication.py
-%%PYTHON_SITELIBDIR%%/wsgitools/authentication.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/authentication.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/applications.py
-%%PYTHON_SITELIBDIR%%/wsgitools/applications.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/applications.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/digest.py
-%%PYTHON_SITELIBDIR%%/wsgitools/digest.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/digest.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/filters.py
-%%PYTHON_SITELIBDIR%%/wsgitools/filters.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/filters.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/middlewares.py
-%%PYTHON_SITELIBDIR%%/wsgitools/middlewares.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/middlewares.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/__init__.py
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/asynchronous.py
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/asynchronous.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/asynchronous.pyo
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/forkpool.py
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/forkpool.pyc
-%%PYTHON_SITELIBDIR%%/wsgitools/scgi/forkpool.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/wsgitools/scgi
-@dirrm %%PYTHON_SITELIBDIR%%/wsgitools
diff --git a/devel/py-yum-metadata-parser/Makefile b/devel/py-yum-metadata-parser/Makefile
index c06550c69855..cc99b8efe6a7 100644
--- a/devel/py-yum-metadata-parser/Makefile
+++ b/devel/py-yum-metadata-parser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	yum-metadata-parser
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://yum.baseurl.org/download/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,6 +18,6 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 USES=		pkgconfig
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-yum-metadata-parser/pkg-plist b/devel/py-yum-metadata-parser/pkg-plist
deleted file mode 100644
index 4435a0f1fd36..000000000000
--- a/devel/py-yum-metadata-parser/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PYTHON_SITELIBDIR%%/sqlitecachec.py
-%%PYTHON_SITELIBDIR%%/sqlitecachec.pyc
-%%PYTHON_SITELIBDIR%%/sqlitecachec.pyo
-%%PYTHON_SITELIBDIR%%/_sqlitecache.so
diff --git a/graphics/py-png/Makefile b/graphics/py-png/Makefile
index d064af918622..d50742259262 100644
--- a/graphics/py-png/Makefile
+++ b/graphics/py-png/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	png
 PORTVERSION=	0.0.13
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +15,7 @@ COMMENT=	Python PNG encoder/decoder
 PROJECTHOST=	pypng
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pypng
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/py-png/pkg-plist b/graphics/py-png/pkg-plist
deleted file mode 100644
index ce9d8ba828db..000000000000
--- a/graphics/py-png/pkg-plist
+++ /dev/null
@@ -1,10 +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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/png.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/png.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/png.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%