- Update to 1.3.1

- Remove pre-build, post-install target in Makefile, and all patches under files/

6 files changed, 10 insertions, 59 deletions

diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 101d7aad6d4c..74a42f5838eb 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	virtualenv
-PORTVERSION=	1.1
+PORTVERSION=	1.3.1
 #PORTREVISION=	0
-PORTREVISION=	1
 CATEGORIES=	devel python
-MASTER_SITES=	http://pypi.python.org/packages/source/v/virtualenv/ \
+MASTER_SITES=	${MASTER_SITE_CHEESESHOP} \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
+MASTER_SITE_SUBDIR=	source/v/virtualenv		
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -22,23 +22,9 @@ 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}
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	easy_install
 
-pre-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} setopt -c easy_install -o exclude-scripts -s 1
-
-post-install:
-	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.bash ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/support-files/
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-PYEASYINSTALL_VER!=	${MAKE} -f ${PORTSDIR}/devel/py-setuptools/Makefile -V PORTVERSION
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-virtualenv/distinfo b/devel/py-virtualenv/distinfo
index a7d624739de4..32eb130359f0 100644
--- a/devel/py-virtualenv/distinfo
+++ b/devel/py-virtualenv/distinfo
@@ -1,3 +1,3 @@
-MD5 (virtualenv-1.1.tar.gz) = 8931b66dbb799120583dd107aab2fa89
-SHA256 (virtualenv-1.1.tar.gz) = 9ec20dec1ef4ab788cfd4866935c309828766c45bfebf25b12605ff36cadba9a
-SIZE (virtualenv-1.1.tar.gz) = 685106
+MD5 (virtualenv-1.3.1.tar.gz) = e70ed86cc3823f0b622e80e035b59297
+SHA256 (virtualenv-1.3.1.tar.gz) = 109462a4101a08cf13dbdea3dffcec51837a5acc04aedb741d5723c2a3d8f8d1
+SIZE (virtualenv-1.3.1.tar.gz) = 1027335
diff --git a/devel/py-virtualenv/files/patch-virtualenv.py b/devel/py-virtualenv/files/patch-virtualenv.py
deleted file mode 100644
index 288e4b61d25c..000000000000
--- a/devel/py-virtualenv/files/patch-virtualenv.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- virtualenv.py	2007-10-10 16:27:32.000000000 +0200
-+++ virtualenv.py.port	2008-01-06 13:42:54.000000000 +0100
-@@ -464,6 +464,9 @@
-     if sys.executable != py_executable:
-         ## FIXME: could I just hard link?
-         shutil.copyfile(sys.executable, py_executable)
-+	if not py_executable.endswith('/python'):
-+	    py_link = os.path.join(os.path.dirname(py_executable), 'python')
-+	    os.symlink(os.path.basename(py_executable), py_link)
-         make_exe(py_executable)
-     
-     if 'Python.framework' in sys.prefix:
diff --git a/devel/py-virtualenv/files/virtualenv.bash.in b/devel/py-virtualenv/files/virtualenv.bash.in
deleted file mode 100644
index 8b8c199a191e..000000000000
--- a/devel/py-virtualenv/files/virtualenv.bash.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# $FreeBSD$
-
-ARGS=(${VIRTUALENVARGS})
-NEWPYTHONENV="${ARGS[$((${#ARGS[*]} - 1))]}"
-
-if [ ! -d ${NEWPYTHONENV} ]; then
-	%%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
deleted file mode 100644
index 6808e7b45497..000000000000
--- a/devel/py-virtualenv/files/virtualenv.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$1" = "" ]; then
-    echo "usage: $0 ENVIRONMENT_NAME"
-else
-    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 6c2668ad5cee..4732752357e9 100644
--- a/devel/py-virtualenv/pkg-plist
+++ b/devel/py-virtualenv/pkg-plist
@@ -12,11 +12,10 @@ 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-%%PYEASYINSTALL_VER%%-py%%PYTHON_VER%%.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/virtualenv.bash
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files/setuptools-0.6c9-py%%PYTHON_VER%%.egg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/virtualenv.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/support-files
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%