ports/128843: [Update]www/py-cherrypy:update to 3.1.1
Wen heping
wenheping at gmail.com
Thu Nov 13 15:40:02 UTC 2008
>Number: 128843
>Category: ports
>Synopsis: [Update]www/py-cherrypy:update to 3.1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 13 15:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Wen heping
>Release: FreeBSD 7.0 release
>Organization:
ChangAn Middle School
>Environment:
FreeBSD tinderbox.wenjing.com 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
update to 3.1.1 from 3.0.3
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -curN py-cherrypy/Makefile py-cherrypy.new/Makefile
--- py-cherrypy/Makefile 2008-05-26 21:54:52.000000000 +0800
+++ py-cherrypy.new/Makefile 2008-11-14 05:49:43.000000000 +0800
@@ -6,7 +6,7 @@
#
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}/
@@ -16,21 +16,36 @@
MAINTAINER= nivit at FreeBSD.org
COMMENT= A pythonic, object-oriented web development framework
-USE_PYTHON= 2.3+
+USE_ZIP= yes
+USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= CherryPy
-REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
-
-.if defined(NOPORTEXAMPLES)
-MAKE_ENV+= NOPORTEXAMPLES=${NOPORTEXAMPLES}
+DOC_FILES= README.txt pdf_file.pdf custom_error.html
+EXAMPLE_FILES= __init__.py bonus-sqlobject.py tut01_helloworld.py \
+ tut02_expose_methods.py tut03_get_and_post.py \
+ tut04_complex_site.py tut05_derived_objects.py \
+ tut06_default_method.py tut07_sessions.py \
+ tut08_generators_and_yield.py tut09_files.py \
+ tut10_http_errors.py tutorial.conf
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+ ${MKDIR} ${DOCSDIR}
+.for i in ${DOC_FILES}
+ @cd ${WRKSRC}/cherrypy/tutorial && ${INSTALL_DATA} ${i} ${DOCSDIR}
+.endfor
+ @${ECHO_MSG} " [DONE]"
.endif
-.if defined(NOPORTDOCS)
-MAKE_ENV+= NOPORTDOCS=${NOPORTDOCS}
+.if !defined(NOPORTEXAMPLES)
+ @${ECHO_MSG} -n ">> Installing examples in ${EXAMPLESDIR}..."
+ ${MKDIR} ${EXAMPLESDIR}
+.for i in ${EXAMPLE_FILES}
+ @cd ${WRKSRC}/cherrypy/tutorial && ${INSTALL_DATA} ${i} ${EXAMPLESDIR}
+.endfor
+ @${ECHO_MSG} " [DONE]"
.endif
-post-patch:
- @${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
-
.include <bsd.port.mk>
diff -curN py-cherrypy/distinfo py-cherrypy.new/distinfo
--- py-cherrypy/distinfo 2008-05-26 21:54:52.000000000 +0800
+++ py-cherrypy.new/distinfo 2008-11-14 05:49:43.000000000 +0800
@@ -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.zip) = b8c2d8779c0a78a9fe17da3f9f3bb7e4
+SHA256 (CherryPy-3.1.1.zip) = f5514d1a1b98e85b0f58755133cd0eea4fa5ab3276bd26623eaccb5211f0d975
+SIZE (CherryPy-3.1.1.zip) = 361707
diff -curN py-cherrypy/files/patch-setup.py py-cherrypy.new/files/patch-setup.py
--- py-cherrypy/files/patch-setup.py 2008-05-26 21:54:53.000000000 +0800
+++ py-cherrypy.new/files/patch-setup.py 2008-11-14 05:49:43.000000000 +0800
@@ -1,51 +1,26 @@
---- 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",
+--- setup.py.orig 2008-11-14 05:37:25.000000000 +0800
++++ setup.py 2008-11-14 05:37:42.000000000 +0800
+@@ -38,7 +38,7 @@
+ 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
- ###############################################################################
+ "cherrypy.wsgiserver", "cherrypy.process",
+ "cherrypy.scaffold",
+ ]
+@@ -59,14 +59,6 @@
+ ]),
+ ('cherrypy/test/static', ['cherrypy/test/static/index.html',
+ 'cherrypy/test/static/dirback.jpg',]),
+- ('cherrypy/tutorial',
+- [
+- 'cherrypy/tutorial/tutorial.conf',
+- 'cherrypy/tutorial/README.txt',
+- 'cherrypy/tutorial/pdf_file.pdf',
+- 'cherrypy/tutorial/custom_error.html',
+- ]
+- ),
+ ]
+ ###############################################################################
+ # end arguments for setup
diff -curN py-cherrypy/pkg-plist py-cherrypy.new/pkg-plist
--- py-cherrypy/pkg-plist 2008-05-26 21:54:52.000000000 +0800
+++ py-cherrypy.new/pkg-plist 2008-11-14 05:49:43.000000000 +0800
@@ -1,4 +1,8 @@
@comment $FreeBSD: ports/www/py-cherrypy/pkg-plist,v 1.6 2008/05/26 13:54:52 nivit Exp $
+%%PYTHON_SITELIBDIR%%/cherrypy/LICENSE.txt
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi_server.pyo
%%PYTHON_SITELIBDIR%%/cherrypy/__init__.py
%%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyc
%%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyo
@@ -14,9 +18,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 +45,7 @@
%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.py
%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyc
%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.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,9 @@
%%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.py
%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyc
%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyo
@@ -189,43 +194,63 @@
%%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/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/py25.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/py25.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test.pem
+%%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_safe_multipart.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_safe_multipart.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/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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bonus-sqlobject.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut01_helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut02_expose_methods.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut03_get_and_post.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut04_complex_site.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut05_derived_objects.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut06_default_method.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut07_sessions.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut08_generators_and_yield.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut09_files.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.py
%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyc
%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyo
@@ -234,8 +259,10 @@
%%PORTDOCS%%%%DOCSDIR%%/pdf_file.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
-%%PORTEXAMPLES%%@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/tutorial
@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
+ at dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold/static
+ at dirrm %%PYTHON_SITELIBDIR%%/cherrypy/scaffold
+ at dirrm %%PYTHON_SITELIBDIR%%/cherrypy/process
@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
@dirrm %%PYTHON_SITELIBDIR%%/cherrypy
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list