- Update to 2.3.0

- Change download site
- Check for NOPORTEXAMPLES variable instead of WITH_EXAMPLES
- Don't mix %%PORTEXAMPLES%% with %%PYTHON_SITELIBDIR, and so make portlint happy

PR:		ports/128844
Submitted by:	Wen Heping <wenheping at gmail dot com>
Approved by:	maintainer timeout (alexbl, 9 weeks), and because required by PR: ports/130180

3 files changed, 19 insertions, 11 deletions

diff --git a/www/py-cherrypy-old/Makefile b/www/py-cherrypy-old/Makefile
index 68571aac179c..c1822ebea3eb 100644
--- a/www/py-cherrypy-old/Makefile
+++ b/www/py-cherrypy-old/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	2.2.1
+PORTVERSION=	2.3.0
 PORTEPOCH=	1
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://download.cherrypy.org/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-old
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
@@ -28,14 +27,14 @@ RM_OPTS=	-r
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 CPEXAMPLES=	${PYTHON_SITELIBDIR}/${PORTNAME}/tutorial
 
-.if !defined(WITH_EXAMPLES)
-PLIST_SUB=	PORTEXAMPLES="@comment "
+.if defined(NOPORTEXAMPLES)
+PLIST_SUB=	PORTPYTHON_SITELIBDIR="@comment "
 .else
-PLIST_SUB=	PORTEXAMPLES=""
+PLIST_SUB=	PORTPYTHON_SITELIBDIR=""
 .endif
 
 post-install:
-.if !defined(WITH_EXAMPLES)
+.if defined(NOPORTEXAMPLES)
 	@${RM} ${RM_OPTS} ${CPEXAMPLES}
 .else
 	@${MV} ${CPEXAMPLES} ${EXAMPLESDIR} && \
diff --git a/www/py-cherrypy-old/distinfo b/www/py-cherrypy-old/distinfo
index 0055b499e977..a3acabfeb4a0 100644
--- a/www/py-cherrypy-old/distinfo
+++ b/www/py-cherrypy-old/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-2.2.1.tar.gz) = 14bf17b0706bc480342cb8fcfaed74cd
-SHA256 (CherryPy-2.2.1.tar.gz) = af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
-SIZE (CherryPy-2.2.1.tar.gz) = 219932
+MD5 (CherryPy-2.3.0.tar.gz) = 80ce0f666f2899d4e681432e4061db16
+SHA256 (CherryPy-2.3.0.tar.gz) = a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf
+SIZE (CherryPy-2.3.0.tar.gz) = 241999
diff --git a/www/py-cherrypy-old/pkg-plist b/www/py-cherrypy-old/pkg-plist
index 7a920973b35c..c291cf93d04d 100644
--- a/www/py-cherrypy-old/pkg-plist
+++ b/www/py-cherrypy-old/pkg-plist
@@ -1,4 +1,7 @@
 @comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver3.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver3.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver3.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/__init__.pyo
@@ -202,10 +205,16 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.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
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyo
-%%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial
+%%PORTPYTHON_SITELIBDIR%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.pyc