diff options
| author | olivierd <olivierd@FreeBSD.org> | 2013-08-31 12:05:11 +0800 |
|---|---|---|
| committer | olivierd <olivierd@FreeBSD.org> | 2013-08-31 12:05:11 +0800 |
| commit | 3f7b1d32218d4167367a80a4b9cb26b396cc3922 (patch) | |
| tree | efad4d81dacbb292e2d0591c675ced00d9e9c25b /net/py-urllib3 | |
| parent | 20f99ac25bfe2665d484854a13c07468231a1b05 (diff) | |
| download | freebsd-ports-gnome-3f7b1d32218d4167367a80a4b9cb26b396cc3922.tar.gz freebsd-ports-gnome-3f7b1d32218d4167367a80a4b9cb26b396cc3922.tar.zst freebsd-ports-gnome-3f7b1d32218d4167367a80a4b9cb26b396cc3922.zip | |
- Update to 1.7
- Fix pkg-plist with Python 2 and Python 3
Diffstat (limited to 'net/py-urllib3')
| -rw-r--r-- | net/py-urllib3/Makefile | 26 | ||||
| -rw-r--r-- | net/py-urllib3/distinfo | 4 | ||||
| -rw-r--r-- | net/py-urllib3/pkg-plist | 12 |
3 files changed, 33 insertions, 9 deletions
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile index 1cbf94332d18..f4f634c180c6 100644 --- a/net/py-urllib3/Makefile +++ b/net/py-urllib3/Makefile @@ -3,7 +3,7 @@ # PORTNAME= urllib3 -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,9 +13,27 @@ COMMENT= Enhance HTTP Python's standard library LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.2:${PORTSDIR}/net/py-ndg_httpsclient - USE_PYTHON= yes USE_PYDISTUTILS= easy_install -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# ndg_httpclient is only available for Python 2 +.if ${PYTHON_REL} < 300 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.2:${PORTSDIR}/net/py-ndg_httpsclient +PLIST_SUB+= SSL="" +.else +PLIST_SUB+= SSL="@comment " +.endif + +.if ${PYTHON_REL} >= 320 +.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" +.endif + +# distutils module can't exclude file (during install step) +post-extract: +.if ${PYTHON_REL} >= 300 + @${RM} ${WRKSRC}/urllib3/contrib/pyopenssl.py +.endif + +.include <bsd.port.post.mk> diff --git a/net/py-urllib3/distinfo b/net/py-urllib3/distinfo index 4ef8ee366f3b..ec86a840a6b6 100644 --- a/net/py-urllib3/distinfo +++ b/net/py-urllib3/distinfo @@ -1,2 +1,2 @@ -SHA256 (urllib3-1.6.tar.gz) = df54bfde115c7358b0e30d892e23340502fe8f014dc43e05f1d240a75dab3be7 -SIZE (urllib3-1.6.tar.gz) = 44619 +SHA256 (urllib3-1.7.tar.gz) = c31f4ee4c76c56794cec5b23af042515abb93d667f1a3fbfe3e452056c6c4be0 +SIZE (urllib3-1.7.tar.gz) = 61123 diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist index 2a2e6a9fdfdf..99b56ba8aceb 100644 --- a/net/py-urllib3/pkg-plist +++ b/net/py-urllib3/pkg-plist @@ -9,6 +9,9 @@ %%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 @@ -30,12 +33,15 @@ %%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 +%%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 |