Hi, Am 07.04.2011 um 12:30 schrieb wen heping:
> Hi, > > Here's an update of www/py-CherryPy to 3.2.0 > > Tested on loongson OK. and regress test OK. > > Comments? Ok? I wonder if this do-regress line change is correct. Regards, Jörg > diff -urN py-CherryPy/Makefile py-CherryPy.new/Makefile > --- py-CherryPy/Makefile Fri Jan 7 01:28:43 2011 > +++ py-CherryPy.new/Makefile Thu Apr 7 18:14:28 2011 > @@ -2,7 +2,7 @@ > > COMMENT= pythonic, object-oriented web development framework > > -MODPY_EGG_VERSION= 3.1.2 > +MODPY_EGG_VERSION= 3.2.0 > DISTNAME= CherryPy-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > CATEGORIES= www > @@ -20,8 +20,9 @@ > MASTER_SITES= http://download.cherrypy.org/cherrypy/${MODPY_EGG_VERSION}/ > > MODULES= lang/python > +MODPY_SETUPTOOLS= Yes > > do-regress: > - @cd ${WRKSRC} && ${MODPY_BIN} ./cherrypy/test/test.py --dumb > + @cd ${WRKSRC} && ${MODPY_BIN} ./py2/cherrypy/test/webtest.py --dumb > > .include <bsd.port.mk> > diff -urN py-CherryPy/distinfo py-CherryPy.new/distinfo > --- py-CherryPy/distinfo Fri Jan 7 01:28:43 2011 > +++ py-CherryPy.new/distinfo Thu Apr 7 17:44:47 2011 > @@ -1,5 +1,5 @@ > -MD5 (CherryPy-3.1.2.tar.gz) = FcYLOpGIa5owTTZvupNmnA== > -RMD160 (CherryPy-3.1.2.tar.gz) = Q6NLx0VNohtZfGAST/D8YbjcPjE= > -SHA1 (CherryPy-3.1.2.tar.gz) = qUrt/Q5nWFjbzDLdJQwj0oXum4g= > -SHA256 (CherryPy-3.1.2.tar.gz) = Df1lUHsEfVTAmEnnpLi902FvqHdqXb/3aXy/bqFVm/Y= > -SIZE (CherryPy-3.1.2.tar.gz) = 319196 > +MD5 (CherryPy-3.2.0.tar.gz) = 5cEyK/XOliwWKDq3ptzKPw== > +RMD160 (CherryPy-3.2.0.tar.gz) = jLL9oqz8KproQCX1QajS2HdkdM0= > +SHA1 (CherryPy-3.2.0.tar.gz) = /QW0+XX4SNxfURa49QS5vTHpOWk= > +SHA256 (CherryPy-3.2.0.tar.gz) = CnDRY+4zuJLfBkq3DQl9D8Elx0/AxtpBiylkux1tGP4= > +SIZE (CherryPy-3.2.0.tar.gz) = 921937 > diff -urN py-CherryPy/pkg/PLIST py-CherryPy.new/pkg/PLIST > --- py-CherryPy/pkg/PLIST Fri Jan 7 01:28:43 2011 > +++ py-CherryPy.new/pkg/PLIST Thu Apr 7 18:12:03 2011 > @@ -1,15 +1,19 @@ > -@comment $OpenBSD: PLIST,v 1.9 2011/01/06 17:28:43 rpointel Exp $ > +@comment $OpenBSD$ > @conflict py-cherrypy2-* > bin/cherryd > -lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info > +lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > +lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > +lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > +lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > +lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/cherrypy/ > lib/python${MODPY_VERSION}/site-packages/cherrypy/LICENSE.txt > lib/python${MODPY_VERSION}/site-packages/cherrypy/__init__.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/__init__.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcgifs.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcgifs.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpchecker.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpchecker.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcompat.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcompat.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpconfig.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpconfig.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpdispatch.py > @@ -20,6 +24,10 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cplogging.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpmodpy.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpmodpy.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpnative_server.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpnative_server.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpreqbody.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpreqbody.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cprequest.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cprequest.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpserver.py > @@ -41,10 +49,16 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_basic.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_basic.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_digest.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_digest.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/caching.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/caching.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/covercp.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/covercp.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cpstats.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cpstats.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cptools.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cptools.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/encoding.py > @@ -53,18 +67,18 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/http.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httpauth.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httpauth.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httputil.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httputil.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/jsontools.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/jsontools.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/profiler.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/profiler.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/safemime.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/safemime.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/reprconf.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/reprconf.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/sessions.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/sessions.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/static.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/static.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/tidy.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/tidy.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/wsgiapp.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/wsgiapp.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/xmlrpc.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/xmlrpc.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/process/ > @@ -88,6 +102,10 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/__init__.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/__init__.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_decorators.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_decorators.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_states_demo.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_states_demo.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/benchmark.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/benchmark.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/checkerdemo.py > @@ -96,29 +114,39 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/helper.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/logtest.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/logtest.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfastcgi.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfastcgi.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfcgid.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfcgid.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modpy.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modpy.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modwsgi.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modwsgi.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/py25.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/py25.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/sessiondemo.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/sessiondemo.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/dirback.jpg > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/index.html > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/style.css > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test.pem > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_basic.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_basic.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_digest.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_digest.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_bus.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_bus.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_caching.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_caching.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config_server.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config_server.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_conn.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_conn.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_core.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_core.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_dynamicobjectmapping.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_dynamicobjectmapping.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_encoding.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_encoding.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_etags.py > @@ -129,8 +157,12 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httpauth.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httplib.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httplib.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_json.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_json.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_logging.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_logging.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_mime.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_mime.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_misc_tools.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_misc_tools.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_objectmapping.py > @@ -139,22 +171,18 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_proxy.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_refleaks.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_refleaks.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_request_obj.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_request_obj.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_routes.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_routes.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_safe_multipart.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_safe_multipart.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_session.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_session.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_sessionauthenticate.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_sessionauthenticate.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states_demo.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states_demo.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_static.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_static.pyc > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tidy.py > -lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tidy.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tools.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tools.pyc > lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tutorials.py > @@ -203,3 +231,7 @@ > lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ > lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/__init__.py > lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/__init__.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_builtin.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_builtin.pyc > +lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_pyopenssl.py > +lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_pyopenssl.pyc