- Update to 1.6

Based on PR:		170987 (update to 1.5)
Submitted by:	koobs@

3 files changed, 78 insertions, 13 deletions

diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 6596294a9f92..1cbf94332d18 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: py-urllib3
-# Date created:		2012-01-09
-# Whom:		Olivier Duchateau <duchateau.olivier@gmail.com>
-#
+# Created by: Olivier Duchateau
 # $FreeBSD$
 #
 
 PORTNAME=	urllib3
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,14 +12,10 @@ MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Enhance HTTP Python's standard library
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.2:${PORTSDIR}/net/py-ndg_httpsclient
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|'dummyserver', ||" ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
diff --git a/net/py-urllib3/distinfo b/net/py-urllib3/distinfo
index bf6c7b9a02e6..4ef8ee366f3b 100644
--- a/net/py-urllib3/distinfo
+++ b/net/py-urllib3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (urllib3-1.4.tar.gz) = 3ee920fe0a5b8d1b3a507a9af6c5b6eb88110d37d2de406907ed7606ff24da9d
-SIZE (urllib3-1.4.tar.gz) = 31885
+SHA256 (urllib3-1.6.tar.gz) = df54bfde115c7358b0e30d892e23340502fe8f014dc43e05f1d240a75dab3be7
+SIZE (urllib3-1.6.tar.gz) = 44619
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
new file mode 100644
index 000000000000..2a2e6a9fdfdf
--- /dev/null
+++ b/net/py-urllib3/pkg-plist
@@ -0,0 +1,72 @@
+%%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/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
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.pyc
+%%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/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%%