- Convert to PYDISTUTILS_AUTOPLIST

- Stage support
- Bump PORTREVISION

7 files changed, 13 insertions, 92 deletions

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%%