ports/186581: [PATCH] devel/py-virtualenv: update to 1.11.2 & modernise

Sun Feb 9 11:20:00 UTC 2014

>Number:         186581
>Category:       ports
>Synopsis:       [PATCH] devel/py-virtualenv: update to 1.11.2 & modernise
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 09 11:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Kubilay Kocak
>Release:        FreeBSD 9.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD 9-STABLE-amd64.elysium 9.2-STABLE FreeBSD 9.2-STABLE #0 r260870: Sun Jan 19 10:38:55 EST
>Description:
devel/py-virtualenv: Update to 0.11.2 & Modernise

- Update to 0.11.2
- Update pkg-plist
- Enable STAGE support
- Enable AUTOPLIST support, update pkg-plist
- Deprecate easy_install target
- Deprecate py3k-fix-pkg-plist.inc
- Deprecate OPTIONSFILE override
- Dont need PIPVER and SETUPTOOLSVER variables anymore
- Dont need bsd.port.pre.mk anymore
- Use *PYTHON_*PKGNAMEPREFIX for sphinx BUILD_DEPENDS
- Add TEST_DEPENDS and regression-test: target, tests will be included
  in the next upstream version [1]

[1] https://github.com/pypa/virtualenv/pull/561

Port maintainer (nivit at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- py27-virtualenv-1.11.2.patch begins here ---
diff -ruN /usr/ports/devel/py-virtualenv/Makefile ./Makefile
--- /usr/ports/devel/py-virtualenv/Makefile	2013-09-21 03:13:42.000000000 +1000
+++ ./Makefile	2014-02-09 21:43:49.936509606 +1100
@@ -1,7 +1,7 @@
 # $FreeBSD: head/devel/py-virtualenv/Makefile 327724 2013-09-20 17:13:42Z bapt $
 
 PORTNAME=	virtualenv
-PORTVERSION=	1.10.1
+PORTVERSION=	1.11.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,36 +11,28 @@
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	DOCS
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:${PORTSDIR}/devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}mock:${PORTSDIR}/devel/py-mock
 
-PLIST_SUB=	PYVER=${PYTHON_VER} PIPVER=${PIPVER} \
-		SETUPTOOLSVER=${SETUPTOOLSVER}
+OPTIONS_DEFINE=	DOCS
 
-# Python3 ready
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-
-PIPVER=	1.4.1
-SETUPTOOLSVER=	0.9.8
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PYDISTUTILS_BUILD_TARGET+=	build_sphinx
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
-.if ${PYTHON_REL} >= 320
-.include "${FILESDIR}/py3k-fix-pkg-plist.inc"
-.endif
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} nosetests
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/devel/py-virtualenv/distinfo ./distinfo
--- /usr/ports/devel/py-virtualenv/distinfo	2013-08-31 02:27:50.000000000 +1000
+++ ./distinfo	2014-02-09 20:29:14.577326868 +1100
@@ -1,2 +1,2 @@
-SHA256 (virtualenv-1.10.1.tar.gz) = 857449d69b9ec7d058dcc2e37c53d3895432300881aa61fd2ade178a807b0aa7
-SIZE (virtualenv-1.10.1.tar.gz) = 1325303
+SHA256 (virtualenv-1.11.2.tar.gz) = 3080a1610fa8c4ab23008707ca5c96d7e67d8cb3ed98c7e01e97f542c82bb6df
+SIZE (virtualenv-1.11.2.tar.gz) = 1755846
diff -ruN /usr/ports/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc ./files/py3k-fix-pkg-plist.inc
--- /usr/ports/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc	2014-01-24 11:14:07.000000000 +1100
+++ ./files/py3k-fix-pkg-plist.inc	1970-01-01 10:00:00.000000000 +1000
@@ -1,14 +0,0 @@
-# When Python version is 3.2+ we rewrite all the filenames
-# of TMPPLIST that end with .py[co], so that they conform
-# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
-PYMAGICTAG=	${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
-add-plist-post:
-	@${AWK} '\
-		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/,  "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
-		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
-		{print} \
-		END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \
-		' \
-		pc="__pycache__" mt="$$(${PYMAGICTAG})" sp="${PYTHON_SITELIBDIR:S,${PYTHONBASE}/,,g}" \
-		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
-	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
diff -ruN /usr/ports/devel/py-virtualenv/pkg-plist ./pkg-plist
--- /usr/ports/devel/py-virtualenv/pkg-plist	2013-08-31 02:27:50.000000000 +1000
+++ ./pkg-plist	2014-02-09 20:52:27.187045680 +1100
@@ -1,37 +1,23 @@
-bin/virtualenv
-bin/virtualenv-%%PYVER%%
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support/pip-%%PIPVER%%.tar.gz
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support/setuptools-%%SETUPTOOLSVER%%.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/news.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/virtualenv.txt
 %%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
 %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/default.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/down.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/file.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/nature.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sidebar.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/up.png
@@ -42,9 +28,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/search.html
 %%PORTDOCS%%%%DOCSDIR%%/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/virtualenv.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv_support
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
--- py27-virtualenv-1.11.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:
