- Update to 3.1.1

- Add devel/py-cheetah to RUN_DEPENDS when NOPORTEXAMPLES is not defined
- Remove files/patch-setup.py

PR:		ports/128843
Submitted by:	Wen Heping < wenheping at gmail dot com >

8 files changed, 238 insertions, 226 deletions

diff --git a/www/py-cherrypy-devel/Makefile b/www/py-cherrypy-devel/Makefile
index 4e22322cd641..82a703f23885 100644
--- a/www/py-cherrypy-devel/Makefile
+++ b/www/py-cherrypy-devel/Makefile
@@ -6,31 +6,31 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	3.0.3
+PORTVERSION=	3.1.1
 CATEGORIES=	www python
 MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
+DISTNAME=	CherryPy-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
-USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	CherryPy
+.if !defined(NOPORTEXAMPLES)
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah
 
-REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
-
-.if defined(NOPORTEXAMPLES)
-MAKE_ENV+=	NOPORTEXAMPLES=${NOPORTEXAMPLES}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 .endif
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	 NOPORTDOCS=${NOPORTDOCS}
-.endif
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	CherryPy
 
-post-patch:
-	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${PYTHONPREFIX_SITELIBDIR}/cherrypy && ${COPYTREE_SHARE} tutorial ${EXAMPLESDIR}
+.endif
+	${RM} -R ${PYTHONPREFIX_SITELIBDIR}/cherrypy/tutorial
 
 .include <bsd.port.mk>
diff --git a/www/py-cherrypy-devel/distinfo b/www/py-cherrypy-devel/distinfo
index d456ae712a2e..fd1e341deca2 100644
--- a/www/py-cherrypy-devel/distinfo
+++ b/www/py-cherrypy-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-3.0.3.tar.gz) = a9c5efd94ff1b87f0f1cc29d09875670
-SHA256 (CherryPy-3.0.3.tar.gz) = 534fac59b1e09766ddd7a7c7b2b3102594e93a499ea37ac3ac1c7b1970400692
-SIZE (CherryPy-3.0.3.tar.gz) = 265274
+MD5 (CherryPy-3.1.1.tar.gz) = 1803ebb8f930cea862ad4c9b2a910f0d
+SHA256 (CherryPy-3.1.1.tar.gz) = de35a8416086f60336d74e4bc67c9213d4fd2b6d253f707a1231c50814b5e0a2
+SIZE (CherryPy-3.1.1.tar.gz) = 319871
diff --git a/www/py-cherrypy-devel/files/patch-setup.py b/www/py-cherrypy-devel/files/patch-setup.py
deleted file mode 100644
index b164a0b84109..000000000000
--- a/www/py-cherrypy-devel/files/patch-setup.py
+++ /dev/null
@@ -1,51 +0,0 @@
---- setup.py	2008-01-13 22:38:39.000000000 +0100
-+++ setup.py.port	2008-05-25 12:04:24.000000000 +0200
-@@ -38,24 +38,39 @@
- cp_license="BSD"
- packages=[
-     "cherrypy", "cherrypy.lib",
--    "cherrypy.tutorial", "cherrypy.test",

-+    "cherrypy.test",

-     "cherrypy.wsgiserver",
- ]
- download_url="http://download.cherrypy.org/cherrypy/3.0.3/"
- data_files=[
--    ('cherrypy/tutorial',
--        [
--            'cherrypy/tutorial/tutorial.conf',
--            'cherrypy/tutorial/README.txt',
--            'cherrypy/tutorial/pdf_file.pdf',
--            'cherrypy/tutorial/custom_error.html',
--        ]
--    ),
-+
-     ('cherrypy', ['cherrypy/favicon.ico',]),
-     ('cherrypy/test', ['cherrypy/test/style.css',]),
-     ('cherrypy/test/static', ['cherrypy/test/static/index.html',
-                               'cherrypy/test/static/dirback.jpg',]),
- ]
-+
-+if not os.environ.has_key("NOPORTEXAMPLES"):
-+    packages.append("cherrypy.tutorial")
-+    data_files.append(
-+	('cherrypy/tutorial',
-+    	    [
-+        	'cherrypy/tutorial/tutorial.conf',
-+    	    ]
-+	),
-+    )
-+
-+if not os.environ.has_key("NOPORTDOCS"):
-+    data_files.append(
-+	('%%DOCSDIR%%',
-+	    [
-+        	'cherrypy/tutorial/README.txt',
-+        	'cherrypy/tutorial/pdf_file.pdf',
-+        	'cherrypy/tutorial/custom_error.html',
-+	    ]
-+	),
-+    )
-+
- ###############################################################################
- # end arguments for setup
- ###############################################################################
diff --git a/www/py-cherrypy-devel/pkg-plist b/www/py-cherrypy-devel/pkg-plist
index de8df0f4cfaf..9bda70693019 100644
--- a/www/py-cherrypy-devel/pkg-plist
+++ b/www/py-cherrypy-devel/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/cherrypy/LICENSE.txt
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyo
@@ -14,9 +15,6 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.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
@@ -44,6 +42,10 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/cherryd
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
@@ -72,6 +74,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyo
@@ -87,6 +95,27 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/example.conf
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/site.conf
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/static/made_with_cherrypy_small.png
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyo
@@ -99,15 +128,25 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/dirback.jpg
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/index.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/style.css
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test.pem
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyo
@@ -135,6 +174,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyo
@@ -150,6 +195,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyo
@@ -180,6 +231,9 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyo
@@ -189,53 +243,56 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tutorial.conf
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyo
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/custom_error.html
-%%PORTDOCS%%%%DOCSDIR%%/pdf_file.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/custom_error.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/pdf_file.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tutorial.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
-%%PORTEXAMPLES%%@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/tutorial
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold/static
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/process
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 4e22322cd641..82a703f23885 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -6,31 +6,31 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	3.0.3
+PORTVERSION=	3.1.1
 CATEGORIES=	www python
 MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
+DISTNAME=	CherryPy-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
-USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	CherryPy
+.if !defined(NOPORTEXAMPLES)
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah
 
-REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
-
-.if defined(NOPORTEXAMPLES)
-MAKE_ENV+=	NOPORTEXAMPLES=${NOPORTEXAMPLES}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 .endif
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	 NOPORTDOCS=${NOPORTDOCS}
-.endif
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	CherryPy
 
-post-patch:
-	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${PYTHONPREFIX_SITELIBDIR}/cherrypy && ${COPYTREE_SHARE} tutorial ${EXAMPLESDIR}
+.endif
+	${RM} -R ${PYTHONPREFIX_SITELIBDIR}/cherrypy/tutorial
 
 .include <bsd.port.mk>
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index d456ae712a2e..fd1e341deca2 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-3.0.3.tar.gz) = a9c5efd94ff1b87f0f1cc29d09875670
-SHA256 (CherryPy-3.0.3.tar.gz) = 534fac59b1e09766ddd7a7c7b2b3102594e93a499ea37ac3ac1c7b1970400692
-SIZE (CherryPy-3.0.3.tar.gz) = 265274
+MD5 (CherryPy-3.1.1.tar.gz) = 1803ebb8f930cea862ad4c9b2a910f0d
+SHA256 (CherryPy-3.1.1.tar.gz) = de35a8416086f60336d74e4bc67c9213d4fd2b6d253f707a1231c50814b5e0a2
+SIZE (CherryPy-3.1.1.tar.gz) = 319871
diff --git a/www/py-cherrypy/files/patch-setup.py b/www/py-cherrypy/files/patch-setup.py
deleted file mode 100644
index b164a0b84109..000000000000
--- a/www/py-cherrypy/files/patch-setup.py
+++ /dev/null
@@ -1,51 +0,0 @@
---- setup.py	2008-01-13 22:38:39.000000000 +0100
-+++ setup.py.port	2008-05-25 12:04:24.000000000 +0200
-@@ -38,24 +38,39 @@
- cp_license="BSD"
- packages=[
-     "cherrypy", "cherrypy.lib",
--    "cherrypy.tutorial", "cherrypy.test",

-+    "cherrypy.test",

-     "cherrypy.wsgiserver",
- ]
- download_url="http://download.cherrypy.org/cherrypy/3.0.3/"
- data_files=[
--    ('cherrypy/tutorial',
--        [
--            'cherrypy/tutorial/tutorial.conf',
--            'cherrypy/tutorial/README.txt',
--            'cherrypy/tutorial/pdf_file.pdf',
--            'cherrypy/tutorial/custom_error.html',
--        ]
--    ),
-+
-     ('cherrypy', ['cherrypy/favicon.ico',]),
-     ('cherrypy/test', ['cherrypy/test/style.css',]),
-     ('cherrypy/test/static', ['cherrypy/test/static/index.html',
-                               'cherrypy/test/static/dirback.jpg',]),
- ]
-+
-+if not os.environ.has_key("NOPORTEXAMPLES"):
-+    packages.append("cherrypy.tutorial")
-+    data_files.append(
-+	('cherrypy/tutorial',
-+    	    [
-+        	'cherrypy/tutorial/tutorial.conf',
-+    	    ]
-+	),
-+    )
-+
-+if not os.environ.has_key("NOPORTDOCS"):
-+    data_files.append(
-+	('%%DOCSDIR%%',
-+	    [
-+        	'cherrypy/tutorial/README.txt',
-+        	'cherrypy/tutorial/pdf_file.pdf',
-+        	'cherrypy/tutorial/custom_error.html',
-+	    ]
-+	),
-+    )
-+
- ###############################################################################
- # end arguments for setup
- ###############################################################################
diff --git a/www/py-cherrypy/pkg-plist b/www/py-cherrypy/pkg-plist
index de8df0f4cfaf..9bda70693019 100644
--- a/www/py-cherrypy/pkg-plist
+++ b/www/py-cherrypy/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/cherrypy/LICENSE.txt
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyo
@@ -14,9 +15,6 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.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
@@ -44,6 +42,10 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/cherryd
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
@@ -72,6 +74,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/safemime.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions-r2062.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyo
@@ -87,6 +95,27 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/plugins.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/servers.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/win32.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.py
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/process/wspbus.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/example.conf
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/site.conf
+%%PYTHON_SITELIBDIR%%/cherrypy/scaffold/static/made_with_cherrypy_small.png
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyo
@@ -99,15 +128,25 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/logtest.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/modfcgid.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modwsgi.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/dirback.jpg
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/index.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/style.css
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test.pem
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyo
@@ -135,6 +174,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httplib.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logging.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyo
@@ -150,6 +195,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session-r2062.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyo
@@ -180,6 +231,9 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_vhost.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyo
@@ -189,53 +243,56 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/__init__.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/bonus-sqlobject.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut01_helloworld.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut02_expose_methods.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut03_get_and_post.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut04_complex_site.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut05_derived_objects.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut06_default_method.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut07_sessions.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut08_generators_and_yield.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut09_files.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.py
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.pyc
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tut10_http_errors.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial/tutorial.conf
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyo
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/custom_error.html
-%%PORTDOCS%%%%DOCSDIR%%/pdf_file.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/bonus-sqlobject.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/custom_error.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/pdf_file.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut01_helloworld.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut02_expose_methods.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut03_get_and_post.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut04_complex_site.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut05_derived_objects.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut06_default_method.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut07_sessions.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut08_generators_and_yield.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut09_files.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tut10_http_errors.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/tutorial.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
-%%PORTEXAMPLES%%@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/tutorial
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold/static
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/process
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy