3 files changed, 6 insertions, 32 deletions

diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index b24b643a35ea..48a682f5d373 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pylons
-PORTVERSION=	0.9.7
-PORTREVISION=	0
+PORTVERSION=	1.0
 CATEGORIES=	www python
 MASTER_SITES=	http://pylonshq.com/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,25 +18,19 @@ COMMENT=	Pylons Web Framework
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy \
 		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.3:${PORTSDIR}/www/py-pastescript \
-		${PYTHON_PKGNAMEPREFIX}beaker>=1.2.2:${PORTSDIR}/www/py-beaker \
+		${PYTHON_PKGNAMEPREFIX}beaker>=1.3:${PORTSDIR}/www/py-beaker \
 		${PYTHON_PKGNAMEPREFIX}decorator>=2.3.2:${PORTSDIR}/devel/py-decorator \
 		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:${PORTSDIR}/www/py-formencode \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.4:${PORTSDIR}/textproc/py-mako \
 		${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}routes>=1.10.3:${PORTSDIR}/www/py-routes \
+		${PYTHON_PKGNAMEPREFIX}routes>=1.12:${PORTSDIR}/www/py-routes \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson \
 		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:${PORTSDIR}/www/py-webhelpers \
 		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:${PORTSDIR}/www/py-WebError \
 		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \
 		${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:${PORTSDIR}/www/py-WebTest \
 		${PYTHON_PKGNAMEPREFIX}Tempita>=0.2:${PORTSDIR}/textproc/py-Tempita \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.4:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0.7:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}TurboCheetah>=0.9.5:${PORTSDIR}/devel/py-turbocheetah \
-		${PYTHON_PKGNAMEPREFIX}kid>=0.9:${PORTSDIR}/devel/py-kid \
-		${PYTHON_PKGNAMEPREFIX}TurboKid>=0.9.1:${PORTSDIR}/devel/py-turbokid \
-		${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.5+
diff --git a/www/py-pylons/distinfo b/www/py-pylons/distinfo
index f9f733d35696..79813d1737ae 100644
--- a/www/py-pylons/distinfo
+++ b/www/py-pylons/distinfo
@@ -1,3 +1,2 @@
-MD5 (Pylons-0.9.7.tar.gz) = f6de97faa730eb0e975f6b2e64a0c574
-SHA256 (Pylons-0.9.7.tar.gz) = 36a62a184819ef01e65c865364f1b262299e6215ef55d8add6a1a258a9dd6933
-SIZE (Pylons-0.9.7.tar.gz) = 204609
+SHA256 (Pylons-1.0.tar.gz) = 411e5875115913a714cb0aecb96a874766b5ec39b6f9ed2bd9edd3562899fc66
+SIZE (Pylons-1.0.tar.gz) = 237206
diff --git a/www/py-pylons/pkg-plist b/www/py-pylons/pkg-plist
index 72f3bc6035ac..f489e8c0f5cb 100644
--- a/www/py-pylons/pkg-plist
+++ b/www/py-pylons/pkg-plist
@@ -11,9 +11,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/commands.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/commands.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/commands.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/configuration.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/configuration.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/configuration.pyo
@@ -29,18 +26,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/controllers/xmlrpc.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/controllers/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/controllers/xmlrpc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/database.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/database.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/database.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorator.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/_decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/_decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/_decorator.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/cache.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/cache.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/cache.pyo
@@ -56,18 +44,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/helpers.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/translation.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/translation.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n/translation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/legacy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/legacy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/legacy.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.pyo