From owner-svn-ports-head@FreeBSD.ORG Sat Aug 31 04:05:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E2965D24; Sat, 31 Aug 2013 04:05:12 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CF1B0253F; Sat, 31 Aug 2013 04:05:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V45CBj059313; Sat, 31 Aug 2013 04:05:12 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7V45CQ0059310; Sat, 31 Aug 2013 04:05:12 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201308310405.r7V45CQ0059310@svn.freebsd.org> From: Olivier Duchateau Date: Sat, 31 Aug 2013 04:05:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325770 - head/net/py-urllib3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 04:05:13 -0000 Author: olivierd Date: Sat Aug 31 04:05:11 2013 New Revision: 325770 URL: http://svnweb.freebsd.org/changeset/ports/325770 Log: - Update to 1.7 - Fix pkg-plist with Python 2 and Python 3 Modified: head/net/py-urllib3/Makefile head/net/py-urllib3/distinfo head/net/py-urllib3/pkg-plist Modified: head/net/py-urllib3/Makefile ============================================================================== --- head/net/py-urllib3/Makefile Sat Aug 31 02:10:36 2013 (r325769) +++ head/net/py-urllib3/Makefile Sat Aug 31 04:05:11 2013 (r325770) @@ -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 LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.2:${PORTSDIR}/net/py-ndg_httpsclient - USE_PYTHON= yes USE_PYDISTUTILS= easy_install -.include +.include + +# 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 Modified: head/net/py-urllib3/distinfo ============================================================================== --- head/net/py-urllib3/distinfo Sat Aug 31 02:10:36 2013 (r325769) +++ head/net/py-urllib3/distinfo Sat Aug 31 04:05:11 2013 (r325770) @@ -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 Modified: head/net/py-urllib3/pkg-plist ============================================================================== --- head/net/py-urllib3/pkg-plist Sat Aug 31 02:10:36 2013 (r325769) +++ head/net/py-urllib3/pkg-plist Sat Aug 31 04:05:11 2013 (r325770) @@ -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