UPDATE www/py-CherryPy-17.4.2

2019-10-21 Thread Björn Ketelaars
Our version of www/py-CherryPy in ports hasn't been updated since 2013.
More important to me is that it doesn't support python3. Diff below
brings our port to the latest version that supports python2 as well as
python3. The rather long changelog can be found at
https://github.com/cherrypy/cherrypy/blob/v17.4.2/CHANGES.rst.
Note that as of v18.0.0 support for Python 2.7 has been dropped.
CherryPy 17 will remain an LTS release for bug and security fixes.

This update relies on a newer version of www/py-cheroot, and several new
ports, which will be send to ports@ in separate mails.

Build tested all consumers, and run tested in combination with
news/sabnzbd.

While here change HOMEPAGE to use https.

Comments/OK?


diff --git Makefile Makefile
index 8fa7933e0f0..1fcc33c185b 100644
--- Makefile
+++ Makefile
@@ -2,33 +2,37 @@
 
 COMMENT=   pythonic, object-oriented web development framework
 
-MODPY_EGG_VERSION= 3.2.2
+MODPY_EGG_VERSION= 17.4.2
 DISTNAME=  CherryPy-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=www
-REVISION=  0
 
-HOMEPAGE=  http://www.cherrypy.org/
+HOMEPAGE=  https://www.cherrypy.org/
 
 # BSD
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  http://download.cherrypy.org/cherrypy/${MODPY_EGG_VERSION}/
-
-MODULES=   lang/python
-
-TEST_DEPENDS = devel/py-nose \
-   www/py-routes
-
-MODPY_SETUPTOOLS = Yes
-
-# test_antistampede requires higher file descriptor limit
-# test_cache_control requires higher SECONDS variable
-# test_states requires signal handling fixed
-TEST_IS_INTERACTIVE =Yes
-
-do-test:
-   @cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests -s -v \
-   lib/cherrypy/test
+MODULES=   lang/python
+MODPY_PI=  Yes
+MODPY_PYTEST=  Yes
+MODPY_SETUPTOOLS=  Yes
+MODPY_PYTEST_ARGS= cherrypy/
+
+BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
+RUN_DEPENDS=   devel/py-contextlib2${MODPY_FLAVOR} \
+   devel/py-more-itertools${MODPY_FLAVOR} \
+   devel/py-six${MODPY_FLAVOR}>=1.11.0 \
+   devel/py-zc-lockfile${MODPY_FLAVOR} \
+   net/py-portend${MODPY_FLAVOR}>=2.1.1 \
+   www/py-cheroot${MODPY_FLAVOR}>=6.2.4
+TEST_DEPENDS=  devel/py-path.py${MODPY_FLAVOR} \
+   devel/py-test-cov${MODPY_FLAVOR} \
+   www/py-requests-toolbelt${MODPY_FLAVOR}
+
+FLAVORS=   python3
+FLAVOR?=
+
+post-install:
+   mv ${PREFIX}/bin/cherryd ${PREFIX}/bin/cherryd${MODPY_BIN_SUFFIX}
 
 .include 
diff --git distinfo distinfo
index a98fea8ae0d..2de05eec3e2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (CherryPy-3.2.2.tar.gz) = 3FqIVieVwu5GLaxbN6uhz0808+JygewRBJInA5MItpE=
-SIZE (CherryPy-3.2.2.tar.gz) = 414099
+SHA256 (CherryPy-17.4.2.tar.gz) = 7xYZrRYfUmdF1PDk5Rd1PZ2YWBTxKA4zBmEzPSugXN8=
+SIZE (CherryPy-17.4.2.tar.gz) = 684366
diff --git pkg/PLIST pkg/PLIST
index 767b16d8662..1098283afe9 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,241 +1,250 @@
 @comment $OpenBSD: PLIST,v 1.11 2013/01/02 11:50:17 gonzalo Exp $
 @conflict py-cherrypy2-*
-bin/cherryd
+bin/cherryd${MODPY_BIN_SUFFIX}
 
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/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.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/__main__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpchecker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpdispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VER

Re: [Update]www/py-CherryPy

2011-05-02 Thread mail
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/MakefileFri Jan  7 01:28:43 2011
> +++ py-CherryPy.new/MakefileThu 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 
> diff -urN py-CherryPy/distinfo py-CherryPy.new/distinfo
> --- py-CherryPy/distinfoFri Jan  7 01:28:43 2011
> +++ py-CherryPy.new/distinfoThu 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-p

[Update]www/py-CherryPy

2011-04-07 Thread 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?

wen





diff -urN py-CherryPy/Makefile py-CherryPy.new/Makefile
--- py-CherryPy/MakefileFri Jan  7 01:28:43 2011
+++ py-CherryPy.new/MakefileThu 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 
diff -urN py-CherryPy/distinfo py-CherryPy.new/distinfo
--- py-CherryPy/distinfoFri Jan  7 01:28:43 2011
+++ py-CherryPy.new/distinfoThu 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}/s

Re: UPDATE: www/py-CherryPy

2007-01-11 Thread Joerg Zinke
On Mon, 8 Jan 2007 09:36:56 -0600
Will Maier <[EMAIL PROTECTED]> wrote:

> Here's a quick update to bring www/py-CherryPy to version 3.0[0].
> Most regress tests seem to pass. Two patches are no longer
> necessary, and one new one has been added to fix a failing regress
> test. Also, MASTER_SITES points at cherrpy.org, now, and not sf.net.
> 
> Joerg (the maintainer) suggested some improvements to the diff and
> asked that I send it to the list. He's running this version on
> macppc/-current; I've tested it on i386/-current.
> 
> The diff is attached and available via HTTP:
> 
> http://www.lfod.us/files/ports/py-CherryPy.diff
> 
> Thanks!

No replies? No one else interested in this? This is a very
straight forward update, just pure python... 

Please, test and comment!
Would be nice to get this in.

Thanks,

Joerg



UPDATE: www/py-CherryPy

2007-01-08 Thread Will Maier
Here's a quick update to bring www/py-CherryPy to version 3.0[0].
Most regress tests seem to pass. Two patches are no longer
necessary, and one new one has been added to fix a failing regress
test. Also, MASTER_SITES points at cherrpy.org, now, and not sf.net.

Joerg (the maintainer) suggested some improvements to the diff and
asked that I send it to the list. He's running this version on
macppc/-current; I've tested it on i386/-current.

The diff is attached and available via HTTP:

http://www.lfod.us/files/ports/py-CherryPy.diff

Thanks!

removed:
 patches/patch-cherrypy_test_webtest_py
 patches/patch-cherrypy_test_test_py

diffstat:
 Makefile |9 -
 distinfo |8 -
 patches/patch-cherrypy_test_test_conn_py |   12 ++
 patches/patch-cherrypy_test_test_py  |   12 --
 patches/patch-cherrypy_test_webtest_py   |   21 ---
 pkg/PLIST|  163 ++-
 6 files changed, 95 insertions(+), 130 deletions(-)

[0] http://www.cherrypy.org/wiki/WhatsNewIn30
http://www.cherrypy.org/wiki/UpgradeTo30


-- 

o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
diff -Nura -x CVS ../py-CherryPy/Makefile ./Makefile
--- ../py-CherryPy/Makefile Sat Jun  3 04:48:04 2006
+++ ./Makefile  Mon Jan  8 09:01:05 2007
@@ -2,8 +2,9 @@
 
 COMMENT=   "pythonic, object-oriented web development framework"
 
-DISTNAME=  CherryPy-2.2.1
-PKGNAME=   py-${DISTNAME}p0
+V= 3.0.0
+DISTNAME=  CherryPy-${V}
+PKGNAME=   ${DISTNAME:S/^/py-/}
 CATEGORIES=www
 
 HOMEPAGE=  http://www.cherrypy.org/ 
@@ -16,11 +17,11 @@
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cherrypy/}
+MASTER_SITES=  http://download.cherrypy.org/cherrypy/${V}/
 
 MODULES=   lang/python
 
 do-regress:
-   @cd ${WRKSRC} && ${MODPY_BIN} ./cherrypy/test/test.py 
+   @cd ${WRKSRC} && ${MODPY_BIN} ./cherrypy/test/test.py --dumb
 
 .include 
diff -Nura -x CVS ../py-CherryPy/distinfo ./distinfo
--- ../py-CherryPy/distinfo Thu May 18 03:44:51 2006
+++ ./distinfo  Mon Jan  8 05:46:10 2007
@@ -1,4 +1,4 @@
-MD5 (CherryPy-2.2.1.tar.gz) = 14bf17b0706bc480342cb8fcfaed74cd
-RMD160 (CherryPy-2.2.1.tar.gz) = c8f406c5eaedb6f710dc746528b8474df48cb3c8
-SHA1 (CherryPy-2.2.1.tar.gz) = cda044ceed78059a56c54ce157bca564f4907a51
-SIZE (CherryPy-2.2.1.tar.gz) = 219932
+MD5 (CherryPy-3.0.0.tar.gz) = 2065d19e79c9c1b30c9327509d2f3d0e
+RMD160 (CherryPy-3.0.0.tar.gz) = e162013d2b7cbb0ee1020c96653d7c26f6fa6481
+SHA1 (CherryPy-3.0.0.tar.gz) = 8deb77b5ce9f80ba58ac010824636a609ec909c4
+SIZE (CherryPy-3.0.0.tar.gz) = 253348
diff -Nura -x CVS ../py-CherryPy/patches/patch-cherrypy_test_test_conn_py 
./patches/patch-cherrypy_test_test_conn_py
--- ../py-CherryPy/patches/patch-cherrypy_test_test_conn_py Wed Dec 31 
18:00:00 1969
+++ ./patches/patch-cherrypy_test_test_conn_py  Mon Jan  8 09:04:51 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- cherrypy/test/test_conn.py.origMon Jan  8 09:04:08 2007
 cherrypy/test/test_conn.py Mon Jan  8 09:04:37 2007
+@@ -5,7 +5,7 @@ import httplib
+ import socket
+ import sys
+ import time
+-timeout = 0.1
++timeout = 2.0
+ 
+ 
+ import cherrypy
diff -Nura -x CVS ../py-CherryPy/patches/patch-cherrypy_test_test_py 
./patches/patch-cherrypy_test_test_py
--- ../py-CherryPy/patches/patch-cherrypy_test_test_py  Thu May 18 03:44:51 2006
+++ ./patches/patch-cherrypy_test_test_py   Wed Dec 31 18:00:00 1969
@@ -1,12 +0,0 @@
-$OpenBSD: patch-cherrypy_test_test_py,v 1.1.1.1 2006/05/18 08:44:51 alek Exp $
 cherrypy/test/test.py.orig Tue May 16 09:59:36 2006
-+++ cherrypy/test/test.py  Tue May 16 09:59:51 2006
-@@ -311,7 +311,7 @@ def run():
- CommandLineParser(testList).run()
- 
- print
--raw_input('hit enter')
-+#raw_input('hit enter')
- 
- 
- if __name__ == '__main__':
diff -Nura -x CVS ../py-CherryPy/patches/patch-cherrypy_test_webtest_py 
./patches/patch-cherrypy_test_webtest_py
--- ../py-CherryPy/patches/patch-cherrypy_test_webtest_py   Thu May 18 
03:44:51 2006
+++ ./patches/patch-cherrypy_test_webtest_pyWed Dec 31 18:00:00 1969
@@ -1,21 +0,0 @@
-$OpenBSD: patch-cherrypy_test_webtest_py,v 1.1.1.1 2006/05/18 08:44:51 alek 
Exp $
 cherrypy/test/webtest.py.orig  Tue May 16 09:55:50 2006
-+++ cherrypy/test/webtest.py   Tue May 16 09:57:15 2006
-@@ -368,9 +368,14 @@ def openURL(url, headers=None, method="G
- conn = http_conn(host, port)
- conn._http_vsn_str = protocol
- conn._http_vsn = int("".join([x for x in protocol if 
x.isdigit()]))
--conn.putrequest(method.upper(), url,
--skip_host=True, skip_accept_encoding=True)
--
-+# skip_accept_encoding argument added in py