3 files changed, 54 insertions, 94 deletions

diff --git a/www/py-cherrypy-old/Makefile b/www/py-cherrypy-old/Makefile
index 2907e7ee217d..6e0d1ff1ab95 100644
--- a/www/py-cherrypy-old/Makefile
+++ b/www/py-cherrypy-old/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	2.2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-old
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
 USE_PYTHON=	2.3+
diff --git a/www/py-cherrypy-old/distinfo b/www/py-cherrypy-old/distinfo
index 0055b499e977..1dc0fcb1e7b7 100644
--- a/www/py-cherrypy-old/distinfo
+++ b/www/py-cherrypy-old/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-2.2.1.tar.gz) = 14bf17b0706bc480342cb8fcfaed74cd
-SHA256 (CherryPy-2.2.1.tar.gz) = af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
-SIZE (CherryPy-2.2.1.tar.gz) = 219932
+MD5 (CherryPy-2.1.1.tar.gz) = f36d73a8c38c1444285b37c3451dce86
+SHA256 (CherryPy-2.1.1.tar.gz) = 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0
+SIZE (CherryPy-2.1.1.tar.gz) = 177839
diff --git a/www/py-cherrypy-old/pkg-plist b/www/py-cherrypy-old/pkg-plist
index 7a920973b35c..e62bc8add44e 100644
--- a/www/py-cherrypy-old/pkg-plist
+++ b/www/py-cherrypy-old/pkg-plist
@@ -5,24 +5,21 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cphttpserver.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cphttpserver.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cphttpserver.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyo
@@ -36,60 +33,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/config.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyo
@@ -99,12 +48,54 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyo
@@ -117,19 +108,9 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/static/dirback.jpg
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/has space.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/index.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/style.css
@@ -145,24 +126,15 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyo
@@ -172,12 +144,6 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyo
@@ -193,12 +159,6 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyo
@@ -246,7 +206,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.conf
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/filters
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static