3 files changed, 61 insertions, 72 deletions

diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index 47db4b8305ed..db514824040d 100644
--- a/www/py-pastedeploy/Makefile
+++ b/www/py-pastedeploy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	PasteDeploy
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/P/PasteDeploy/ \
 		${MASTER_SITE_LOCAL} \
@@ -17,24 +17,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Load, configure, and compose WSGI applications and servers
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools \
-		${PYTHON_SITELIBDIR}/${PYPASTE_EGG}/paste/__init__.py:${PORTSDIR}/www/py-paste
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.6:${PORTSDIR}/www/py-paste
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
-
-PLIST_SUB=	PYPASTEDEPLOY_EGG=${PYPASTEDEPLOY_EGG}
-
-SUB_FILES+=	pkg-deinstall pkg-install
-SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG="${PORTNAME}==${PORTVERSION}"
-
-PYPASTEDEPLOY_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VERSION:S/^python//}.egg
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_NOEGGINFO=	yes
 
 .include <bsd.port.pre.mk>
 
-PYPASTE_EGG!=	${MAKE} -f ${PORTSDIR}/www/py-paste/Makefile -V PYPASTE_EGG
-
 .include <bsd.port.post.mk>
diff --git a/www/py-pastedeploy/distinfo b/www/py-pastedeploy/distinfo
index 78f5aa171f5a..3f44b531748c 100644
--- a/www/py-pastedeploy/distinfo
+++ b/www/py-pastedeploy/distinfo
@@ -1,3 +1,3 @@
-MD5 (PasteDeploy-1.3.1.tar.gz) = a14b360b4ddb0d3ca7aa9bad41d6c91c
-SHA256 (PasteDeploy-1.3.1.tar.gz) = 71c81f5aa60af8238189bf85477d85e926d435df3a28b623842e83406f4a81a8
-SIZE (PasteDeploy-1.3.1.tar.gz) = 27397
+MD5 (PasteDeploy-1.3.2.tar.gz) = 877fcf3fa025a65147fbae87e1765b65
+SHA256 (PasteDeploy-1.3.2.tar.gz) = 0b85eca6e589747da39adf2301623b75d2374286695e68313df938b919e8098c
+SIZE (PasteDeploy-1.3.2.tar.gz) = 30478
diff --git a/www/py-pastedeploy/pkg-plist b/www/py-pastedeploy/pkg-plist
index 7b71a60b95cd..4d799f0e3c8d 100644
--- a/www/py-pastedeploy/pkg-plist
+++ b/www/py-pastedeploy/pkg-plist
@@ -1,54 +1,54 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/config.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/converters.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/converters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/converters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/epdesc.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/epdesc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/epdesc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/loadwsgi.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/loadwsgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/loadwsgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/fixtypeerror.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/fixtypeerror.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/fixtypeerror.pyo
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/threadinglocal.py
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/threadinglocal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util/threadinglocal.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/util
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy/docs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates/paste_deploy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy/paster_templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste/deploy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/paste
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPASTEDEPLOY_EGG%%
+%%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/namespace_packages.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/converters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/converters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/converters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/epdesc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/epdesc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/epdesc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/interfaces.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/loadwsgi.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/loadwsgi.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/loadwsgi.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/fixtypeerror.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/fixtypeerror.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/fixtypeerror.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/threadinglocal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/threadinglocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util/threadinglocal.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/util
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy/docs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy/+package+
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates/paste_deploy
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy/paster_templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/deploy
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%