- Update to 1.1

- Modify files/virtualenv.* to accept the new optional parameter of the program
- Remove hardcoded version of py-setuptools in pkg-plist

5 files changed, 18 insertions, 9 deletions

diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 492415a585f1..ce9f2b0128d9 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualenv
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 #PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	http://pypi.python.org/packages/source/v/virtualenv/ \
@@ -21,6 +21,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 PYEASYINSTALL_INSTALLARGS=	-q -N -S ${PYTHON_SITELIBDIR} -x ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
 PYEASYINSTALL_UNINSTALLARGS+=	-q -m -S ${PYTHON_SITELIBDIR} -x ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
 
+PLIST_SUB=	PYEASYINSTALL_VER=${PYEASYINSTALL_VER} PYTHON_VER=${PYTHON_VER}
+
 SUB_FILES=	${PORTNAME} ${PORTNAME}.bash
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG}
 
@@ -34,4 +36,8 @@ post-install:
 	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.bash ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/support-files/
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PYEASYINSTALL_VER!=	${MAKE} -f ${PORTSDIR}/devel/py-setuptools/Makefile -V PORTVERSION
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-virtualenv/distinfo b/devel/py-virtualenv/distinfo
index e5ac9abeca0a..a7d624739de4 100644
--- a/devel/py-virtualenv/distinfo
+++ b/devel/py-virtualenv/distinfo
@@ -1,3 +1,3 @@
-MD5 (virtualenv-1.0.tar.gz) = fb86aabdfc2033612b936cf08ad811ec
-SHA256 (virtualenv-1.0.tar.gz) = 70bd71debfbf4941dbb3f0213a9711de8e10d092ab84b87e81a1195aa823e6c3
-SIZE (virtualenv-1.0.tar.gz) = 681618
+MD5 (virtualenv-1.1.tar.gz) = 8931b66dbb799120583dd107aab2fa89
+SHA256 (virtualenv-1.1.tar.gz) = 9ec20dec1ef4ab788cfd4866935c309828766c45bfebf25b12605ff36cadba9a
+SIZE (virtualenv-1.1.tar.gz) = 685106
diff --git a/devel/py-virtualenv/files/virtualenv.bash.in b/devel/py-virtualenv/files/virtualenv.bash.in
index efedd038c90f..8b8c199a191e 100644
--- a/devel/py-virtualenv/files/virtualenv.bash.in
+++ b/devel/py-virtualenv/files/virtualenv.bash.in
@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 # $FreeBSD$
 
+ARGS=(${VIRTUALENVARGS})
+NEWPYTHONENV="${ARGS[$((${#ARGS[*]} - 1))]}"
+
 if [ ! -d ${NEWPYTHONENV} ]; then
-	%%PYTHON_CMD%% %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.py ${NEWPYTHONENV}
+	%%PYTHON_CMD%% %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.py ${VIRTUALENVARGS}
 fi
 
 if [ -f ${NEWPYTHONENV}/bin/activate ]; then
 	source ${NEWPYTHONENV}/bin/activate
 fi
-
diff --git a/devel/py-virtualenv/files/virtualenv.in b/devel/py-virtualenv/files/virtualenv.in
index aa9c7d93ded4..6808e7b45497 100644
--- a/devel/py-virtualenv/files/virtualenv.in
+++ b/devel/py-virtualenv/files/virtualenv.in
@@ -4,5 +4,6 @@
 if [ "$1" = "" ]; then
     echo "usage: $0 ENVIRONMENT_NAME"
 else
-    exec env NEWPYTHONENV="$1" %%PREFIX%%/bin/bash --init-file %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/virtualenv.bash
+    POSPARMS="$@"
+    exec env VIRTUALENVARGS="${POSPARMS}" %%PREFIX%%/bin/bash --init-file %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/virtualenv.bash
 fi
diff --git a/devel/py-virtualenv/pkg-plist b/devel/py-virtualenv/pkg-plist
index 8ffa5aaae77d..6c2668ad5cee 100644
--- a/devel/py-virtualenv/pkg-plist
+++ b/devel/py-virtualenv/pkg-plist
@@ -12,7 +12,7 @@ bin/virtualenv
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/refresh-support-files.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/refresh-support-files.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/refresh-support-files.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/setuptools-0.6c7-py2.5.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/setuptools-%%PYEASYINSTALL_VER%%-py%%PYTHON_VER%%.egg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/virtualenv.bash
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.pyc