- Convert to PYDISTUTILS_AUTOPLIST

- Stage support
- Bump PORTREVISION

13 files changed, 21 insertions, 258 deletions

diff --git a/devel/py-resolver/Makefile b/devel/py-resolver/Makefile
index 7f4bb74faaa1..1eb01dc32e05 100644
--- a/devel/py-resolver/Makefile
+++ b/devel/py-resolver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	resolver
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,9 +14,9 @@ COMMENT=	Resolve specially formatted statements to Python objects
 LICENSE=	LGPL21
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's/license="LGPL",/license="LGPL", zip_safe=False,/' \
 		${WRKSRC}/setup.py
diff --git a/devel/py-resolver/pkg-plist b/devel/py-resolver/pkg-plist
deleted file mode 100644
index 9c1aa4ad7b7f..000000000000
--- a/devel/py-resolver/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%%/resolver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/resolver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/resolver.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile
index 4e76d8a7da3b..71081e24dd4a 100644
--- a/graphics/py-django-easy-thumbnails/Makefile
+++ b/graphics/py-django-easy-thumbnails/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	easy-thumbnails
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
@@ -16,9 +17,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-django-easy-thumbnails/pkg-plist b/graphics/py-django-easy-thumbnails/pkg-plist
deleted file mode 100644
index 8e0dea578ce0..000000000000
--- a/graphics/py-django-easy-thumbnails/pkg-plist
+++ /dev/null
@@ -1,147 +0,0 @@
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/alias.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/alias.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/alias.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/conf.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/conf.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/conf.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/engine.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/engine.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/engine.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/exceptions.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/fields.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/fields.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/fields.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/files.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/files.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/files.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/thumbnail_cleanup.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/thumbnail_cleanup.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands/thumbnail_cleanup.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0001_initial.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0001_initial.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0001_initial.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0002_filename_indexes.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0002_filename_indexes.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0002_filename_indexes.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0003_auto__add_storagenew.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0003_auto__add_storagenew.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0003_auto__add_storagenew.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0004_auto__add_field_source_storage_new__add_field_thumbnail_storage_new.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0004_auto__add_field_source_storage_new__add_field_thumbnail_storage_new.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0004_auto__add_field_source_storage_new__add_field_thumbnail_storage_new.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0005_storage_fks_null.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0005_storage_fks_null.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0005_storage_fks_null.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0006_copy_storage.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0006_copy_storage.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0006_copy_storage.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0007_storagenew_fks_not_null.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0007_storagenew_fks_not_null.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0007_storagenew_fks_not_null.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0008_auto__del_field_source_storage__del_field_thumbnail_storage.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0008_auto__del_field_source_storage__del_field_thumbnail_storage.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0008_auto__del_field_source_storage__del_field_thumbnail_storage.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0009_auto__del_storage.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0009_auto__del_storage.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0009_auto__del_storage.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0010_rename_storage.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0010_rename_storage.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0010_rename_storage.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0011_auto__add_field_source_storage_hash__add_field_thumbnail_storage_hash.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0011_auto__add_field_source_storage_hash__add_field_thumbnail_storage_hash.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0011_auto__add_field_source_storage_hash__add_field_thumbnail_storage_hash.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0012_build_storage_hashes.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0012_build_storage_hashes.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0012_build_storage_hashes.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0013_auto__del_storage__del_field_source_storage__del_field_thumbnail_stora.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0013_auto__del_storage__del_field_source_storage__del_field_thumbnail_stora.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0013_auto__del_storage__del_field_source_storage__del_field_thumbnail_stora.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0014_auto__add_unique_source_name_storage_hash__add_unique_thumbnail_name_s.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0014_auto__add_unique_source_name_storage_hash__add_unique_thumbnail_name_s.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0014_auto__add_unique_source_name_storage_hash__add_unique_thumbnail_name_s.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0015_auto__del_unique_thumbnail_name_storage_hash__add_unique_thumbnail_sou.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0015_auto__del_unique_thumbnail_name_storage_hash__add_unique_thumbnail_sou.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/0015_auto__del_unique_thumbnail_name_storage_hash__add_unique_thumbnail_sou.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/models.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/models.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/models.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/processors.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/processors.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/processors.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signal_handlers.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signal_handlers.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signal_handlers.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signals.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signals.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/signals.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/source_generators.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/source_generators.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/source_generators.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/storage.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/storage.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/storage.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/thumbnail.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/thumbnail.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags/thumbnail.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/test_settings.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/test_settings.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/test_settings.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/aliases.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/aliases.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/aliases.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/fields.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/fields.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/fields.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/files.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/files.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/files.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/models.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/models.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/models.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/processors.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/processors.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/processors.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/source_generators.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/source_generators.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/source_generators.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/templatetags.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/templatetags.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/templatetags.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/utils.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/widgets.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/widgets.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/tests/widgets.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/utils.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/utils.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/utils.pyo
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/widgets.py
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/widgets.pyc
-%%PYTHON_SITELIBDIR%%/easy_thumbnails/widgets.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails/tests
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails/templatetags
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails/migrations
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails/management/commands
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails/management
-@dirrmtry %%PYTHON_SITELIBDIR%%/easy_thumbnails
diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile
index 6b92086faa8a..f90ac4329411 100644
--- a/net/py-suds/Makefile
+++ b/net/py-suds/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	suds
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ MAINTAINER=	corsmith@gmail.com
 COMMENT=	A SOAP implementation
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net/py-suds/pkg-plist b/net/py-suds/pkg-plist
deleted file mode 100644
index ddf68a1c022f..000000000000
--- a/net/py-suds/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index 09f507ea0c40..f77fe8316b8f 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bleach
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,7 +16,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib==0.95:${PORTSDIR}/www/py-html5lib
 
 USE_GITHUB=		yes
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 GH_ACCOUNT=	jsocol
 GH_TAGNAME=	v${PORTVERSION}
diff --git a/www/py-bleach/pkg-plist b/www/py-bleach/pkg-plist
deleted file mode 100644
index b1d4ebd50113..000000000000
--- a/www/py-bleach/pkg-plist
+++ /dev/null
@@ -1,40 +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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/callbacks.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/callbacks.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/callbacks.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/encoding.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/encoding.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/encoding.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/sanitizer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/sanitizer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/sanitizer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_basics.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_basics.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_basics.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_css.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_css.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_css.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_links.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_links.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_links.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_unicode.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_unicode.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests/test_unicode.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bleach
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index 90727428a06d..223097c7d2f1 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mechanize
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		http://wwwsearch.sourceforge.net/mechanize/src/
@@ -12,9 +13,7 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Stateful programmatic web browsing in Python
 
 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/www/py-requests-oauthlib/Makefile b/www/py-requests-oauthlib/Makefile
index cb21d9ec3b6b..321aa6df8b16 100644
--- a/www/py-requests-oauthlib/Makefile
+++ b/www/py-requests-oauthlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	requests-oauthlib
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -22,10 +22,10 @@ GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	0b1fe5c
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-requests-oauthlib/pkg-plist b/www/py-requests-oauthlib/pkg-plist
deleted file mode 100644
index a897d1edacbc..000000000000
--- a/www/py-requests-oauthlib/pkg-plist
+++ /dev/null
@@ -1,24 +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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth1_session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth1_session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth2_session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib/oauth1_session.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/requests_oauthlib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 0d8af30b0c2c..fe95ebc2abef 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	restclient
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,8 +16,9 @@ LICENSE=	BSD
 RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-NO_STAGE=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
 post-patch:
 	${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
 
diff --git a/www/py-restclient/pkg-plist b/www/py-restclient/pkg-plist
deleted file mode 100644
index f4c33d3c76e7..000000000000
--- a/www/py-restclient/pkg-plist
+++ /dev/null
@@ -1,18 +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%%/restclient/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%