6 files changed, 52 insertions, 68 deletions

diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 67ff64ff3168..c21376c054c1 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	urllib3
-PORTVERSION=	1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,11 @@ COMMENT=	Enhance HTTP Python's standard library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
+post-patch:
+	@cd ${WRKSRC} && \
+		${FIND} . -type f -name '*.orig' -exec ${RM} -f \{\} \;
+
 .include <bsd.port.mk>
diff --git a/net/py-urllib3/distinfo b/net/py-urllib3/distinfo
index 175e70766089..4562aabc9cd1 100644
--- a/net/py-urllib3/distinfo
+++ b/net/py-urllib3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (urllib3-1.2.tar.gz) = cc49b66adcb45e19c6944cff35eedb60ee2228f0afba51f4da29c47e7a398f15
-SIZE (urllib3-1.2.tar.gz) = 34569
+SHA256 (urllib3-1.2.2.tar.gz) = b7cda49f21ba823f97075ef9db034de969180b7965c77b25bd5d6d46dc1d0312
+SIZE (urllib3-1.2.2.tar.gz) = 35251
diff --git a/net/py-urllib3/files/patch-MANIFEST.in b/net/py-urllib3/files/patch-MANIFEST.in
new file mode 100644
index 000000000000..ecd1949e06d8
--- /dev/null
+++ b/net/py-urllib3/files/patch-MANIFEST.in
@@ -0,0 +1,5 @@
+--- MANIFEST.in.orig	2012-02-06 15:59:04.000000000 +0000
++++ MANIFEST.in	2012-02-07 14:04:08.000000000 +0000
+@@ -1 +1 @@
+-include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt test-requirements.txt
++include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt
diff --git a/net/py-urllib3/files/patch-setup.py b/net/py-urllib3/files/patch-setup.py
index 8d4f1fe6e9e8..c65414067fa3 100644
--- a/net/py-urllib3/files/patch-setup.py
+++ b/net/py-urllib3/files/patch-setup.py
@@ -1,8 +1,13 @@
---- setup.py.orig	2012-01-07 22:23:02.000000000 +0100
-+++ setup.py	2012-01-09 19:08:23.000000000 +0100
-@@ -49,6 +49,6 @@
+--- setup.py.orig	2012-01-30 00:14:40.000000000 +0000
++++ setup.py	2012-02-07 13:49:58.000000000 +0000
+@@ -44,10 +44,10 @@
+       author_email='andrey.petrov@shazow.net',
+       url='http://urllib3.readthedocs.org/',
        license='MIT',
-       packages=['urllib3', 'dummyserver', 'urllib3.packages', 'urllib3.packages.ssl_match_hostname'],
+-      packages=['urllib3', 'dummyserver', 'urllib3.packages',
++      packages=['urllib3', 'urllib3.packages',
+                 'urllib3.packages.ssl_match_hostname', 'urllib3.packages.mimetools_choose_boundary',
+                 ],
        requires=requirements,
 -      tests_require=tests_requirements,
 -      test_suite='test',
diff --git a/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt b/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt
new file mode 100644
index 000000000000..c0cc03e21d83
--- /dev/null
+++ b/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt
@@ -0,0 +1,27 @@
+--- urllib3.egg-info/SOURCES.txt.orig	2012-02-06 16:01:50.000000000 +0000
++++ urllib3.egg-info/SOURCES.txt	2012-02-07 14:05:37.000000000 +0000
+@@ -5,17 +5,6 @@
+ README.rst
+ setup.cfg
+ setup.py
+-test-requirements.txt
+-dummyserver/__init__.py
+-dummyserver/handlers.py
+-dummyserver/server.py
+-dummyserver/testcase.py
+-test/__init__.py
+-test/benchmark.py
+-test/test_collections.py
+-test/test_connectionpool.py
+-test/test_poolmanager.py
+-test/test_response.py
+ urllib3/__init__.py
+ urllib3/_collections.py
+ urllib3/connectionpool.py
+@@ -33,4 +22,4 @@
+ urllib3/packages/__init__.py
+ urllib3/packages/six.py
+ urllib3/packages/mimetools_choose_boundary/__init__.py
+-urllib3/packages/ssl_match_hostname/__init__.py
+\ No newline at end of file
++urllib3/packages/ssl_match_hostname/__init__.py
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
index 4fd1e76da093..88d6b607b32a 100644
--- a/net/py-urllib3/pkg-plist
+++ b/net/py-urllib3/pkg-plist
@@ -1,60 +1,3 @@
-%%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/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/mimetools_choose_boundary/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/mimetools_choose_boundary/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/mimetools_choose_boundary/__init__.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
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/mimetools_choose_boundary
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages
-@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%%/%%PYEASYINSTALL_EGG%%
+@dirrm %%PYTHON_SITELIBDIR%%
+@dirrm %%PYTHON_LIBDIR%%