2 files changed, 73 insertions, 81 deletions

diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 240d1866428e..c1379cb6cd68 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	urllib3
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +14,9 @@ COMMENT=	Enhance HTTP Python's standard library
 LICENSE=	MIT
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYTHON_PY3K_PLIST_HACK=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # ndg_httpclient is only available for Python 2
@@ -27,7 +27,6 @@ PLIST_SUB+=	SSL=""
 PLIST_SUB+=	SSL="@comment "
 .endif
 
-# distutils module can't exclude file (during install step)
 post-extract:
 .if ${PYTHON_REL} >= 300
 	@${RM} ${WRKSRC}/urllib3/contrib/pyopenssl.py
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
index 99b56ba8aceb..8cab926768b2 100644
--- a/net/py-urllib3/pkg-plist
+++ b/net/py-urllib3/pkg-plist
@@ -1,78 +1,71 @@
-%%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%%/dummyserver/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.pyo
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.py
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.pyc
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.py
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.py
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.py
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/server.py
+%%PYTHON_SITELIBDIR%%/dummyserver/server.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/server.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.py
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.py
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.py
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.py
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyo
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.py
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyc
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.py
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/fields.py
+%%PYTHON_SITELIBDIR%%/urllib3/fields.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/fields.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.py
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.py
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/request.py
+%%PYTHON_SITELIBDIR%%/urllib3/request.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/request.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/response.py
+%%PYTHON_SITELIBDIR%%/urllib3/response.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/response.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/util.py
+%%PYTHON_SITELIBDIR%%/urllib3/util.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/util.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/contrib
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3
+@dirrm %%PYTHON_SITELIBDIR%%/dummyserver