- Update to 3.0.2

4 files changed, 106 insertions, 62 deletions

diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index c724032401df..07a38e381150 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.2
 CATEGORIES=	www python
 MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,24 +19,17 @@ USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	CherryPy
 
-LN_OPTS=	-sf
-RM_OPTS=	-r
+REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-CPEXAMPLES=	${PYTHON_SITELIBDIR}/${PORTNAME}/tutorial
-
-.if !defined(WITH_EXAMPLES)
-PLIST_SUB=	PORTEXAMPLES="@comment "
-.else
-PLIST_SUB=	PORTEXAMPLES=""
+.if defined(NOPORTEXAMPLES)
+MAKE_ENV+=	NOPORTEXAMPLES=${NOPORTEXAMPLES}
 .endif
 
-post-install:
-.if !defined(WITH_EXAMPLES)
-	@${RM} ${RM_OPTS} ${CPEXAMPLES}
-.else
-	@${MV} ${CPEXAMPLES} ${EXAMPLESDIR} && \
-	${LN} ${LN_OPTS} ${EXAMPLESDIR} ${CPEXAMPLES}
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	 NOPORTDOCS=${NOPORTDOCS}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+
 .include <bsd.port.mk>
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index c3400ba17428..371f02fc3120 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-3.0.1.tar.gz) = 13b80dbdd9b0491a71b30d4916950968
-SHA256 (CherryPy-3.0.1.tar.gz) = c2d58d02d9b0b5772a52355136c1085fbaf14f6689f849eea41f4fe8bd573886
-SIZE (CherryPy-3.0.1.tar.gz) = 262276
+MD5 (CherryPy-3.0.2.tar.gz) = d0b10db126a708b763f243ef764ad21a
+SHA256 (CherryPy-3.0.2.tar.gz) = cd590e57543bf1c590c006bfd7c222adce6ab1584ef35d72dd91558e4e281a1a
+SIZE (CherryPy-3.0.2.tar.gz) = 262428
diff --git a/www/py-cherrypy/files/patch-setup.py b/www/py-cherrypy/files/patch-setup.py
new file mode 100644
index 000000000000..7235ff6c495d
--- /dev/null
+++ b/www/py-cherrypy/files/patch-setup.py
@@ -0,0 +1,51 @@
+--- setup.py	2007-08-06 02:07:32.000000000 +0200
++++ setup.py.port	2008-01-26 17:46:16.000000000 +0100
+@@ -38,24 +38,38 @@
+ cp_license="BSD"
+ packages=[
+     "cherrypy", "cherrypy.lib",
+-    "cherrypy.tutorial", "cherrypy.test",

+-    "cherrypy.wsgiserver",
++    "cherrypy.test", "cherrypy.wsgiserver",
+ ]
+ download_url="http://download.cherrypy.org/cherrypy/3.0.2/"
+ 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 b2199ef47cd8..a6d2705594f6 100644
--- a/www/py-cherrypy/pkg-plist
+++ b/www/py-cherrypy/pkg-plist
@@ -183,53 +183,53 @@
 %%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
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bonus-sqlobject.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bonus-sqlobject.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bonus-sqlobject.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_error.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdf_file.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut01_helloworld.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut01_helloworld.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut01_helloworld.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut02_expose_methods.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut02_expose_methods.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut02_expose_methods.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut03_get_and_post.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut03_get_and_post.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut03_get_and_post.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut04_complex_site.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut04_complex_site.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut04_complex_site.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut05_derived_objects.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut05_derived_objects.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut05_derived_objects.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut06_default_method.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut06_default_method.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut06_default_method.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut07_sessions.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut07_sessions.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut07_sessions.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut08_generators_and_yield.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut08_generators_and_yield.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut08_generators_and_yield.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut09_files.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut09_files.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut09_files.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.conf
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/custom_error.html
+%%PORTDOCS%%%%DOCSDIR%%/pdf_file.pdf
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/tutorial
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy
+%%PORTDOCS%%@dirrm %%DOCSDIR%%