Changes 10.1.0:

* Bump to cheroot 5.1.0.
* 794: Prefer setting max-age for session cookie
  expiration, moving MSIE hack into a function
  documenting its purpose.

3 files changed, 16 insertions, 23 deletions

diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index ca0f920a73d..d9e6727a69c 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2016/09/12 17:44:14 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/02/13 17:24:30 adam Exp $
 
-DISTNAME=	CherryPy-8.1.0
+DISTNAME=	CherryPy-10.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=C/CherryPy/}
@@ -12,11 +12,10 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=		# none
 
-REPLACE_PYTHON=		cherrypy/cherryd
 REPLACE_PYTHON+=	cherrypy/test/sessiondemo.py
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+DEPENDS+=	${PYPKGPREFIX}-cheroot-[0-9]*:../../www/py-cheroot
+DEPENDS+=	${PYPKGPREFIX}-portend-[0-9]*:../../net/py-portend
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-cherrypy/PLIST b/www/py-cherrypy/PLIST
index a8a0e7ab8bf..14979fd44a0 100644
--- a/www/py-cherrypy/PLIST
+++ b/www/py-cherrypy/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2016/09/12 17:44:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/02/13 17:24:30 adam Exp $
 bin/cherryd
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/cherrypy/LICENSE.txt
 ${PYSITELIB}/cherrypy/__init__.py
 ${PYSITELIB}/cherrypy/__init__.pyc
 ${PYSITELIB}/cherrypy/__init__.pyo
@@ -48,9 +48,6 @@ ${PYSITELIB}/cherrypy/_cprequest.pyo
 ${PYSITELIB}/cherrypy/_cpserver.py
 ${PYSITELIB}/cherrypy/_cpserver.pyc
 ${PYSITELIB}/cherrypy/_cpserver.pyo
-${PYSITELIB}/cherrypy/_cpthreadinglocal.py
-${PYSITELIB}/cherrypy/_cpthreadinglocal.pyc
-${PYSITELIB}/cherrypy/_cpthreadinglocal.pyo
 ${PYSITELIB}/cherrypy/_cptools.py
 ${PYSITELIB}/cherrypy/_cptools.pyc
 ${PYSITELIB}/cherrypy/_cptools.pyo
@@ -66,7 +63,6 @@ ${PYSITELIB}/cherrypy/_cpwsgi_server.pyo
 ${PYSITELIB}/cherrypy/_helper.py
 ${PYSITELIB}/cherrypy/_helper.pyc
 ${PYSITELIB}/cherrypy/_helper.pyo
-${PYSITELIB}/cherrypy/cherryd
 ${PYSITELIB}/cherrypy/daemon.pyc
 ${PYSITELIB}/cherrypy/daemon.pyo
 ${PYSITELIB}/cherrypy/daemon.py
@@ -149,6 +145,7 @@ ${PYSITELIB}/cherrypy/process/wspbus.pyo
 ${PYSITELIB}/cherrypy/scaffold/__init__.py
 ${PYSITELIB}/cherrypy/scaffold/__init__.pyc
 ${PYSITELIB}/cherrypy/scaffold/__init__.pyo
+${PYSITELIB}/cherrypy/scaffold/apache-fcgi.conf
 ${PYSITELIB}/cherrypy/scaffold/example.conf
 ${PYSITELIB}/cherrypy/scaffold/site.conf
 ${PYSITELIB}/cherrypy/scaffold/static/made_with_cherrypy_small.png
@@ -167,6 +164,8 @@ ${PYSITELIB}/cherrypy/test/benchmark.pyo
 ${PYSITELIB}/cherrypy/test/checkerdemo.py
 ${PYSITELIB}/cherrypy/test/checkerdemo.pyc
 ${PYSITELIB}/cherrypy/test/checkerdemo.pyo
+${PYSITELIB}/cherrypy/test/fastcgi.conf
+${PYSITELIB}/cherrypy/test/fcgi.conf
 ${PYSITELIB}/cherrypy/test/helper.py
 ${PYSITELIB}/cherrypy/test/helper.pyc
 ${PYSITELIB}/cherrypy/test/helper.pyo
@@ -188,6 +187,7 @@ ${PYSITELIB}/cherrypy/test/modwsgi.pyo
 ${PYSITELIB}/cherrypy/test/sessiondemo.py
 ${PYSITELIB}/cherrypy/test/sessiondemo.pyc
 ${PYSITELIB}/cherrypy/test/sessiondemo.pyo
+${PYSITELIB}/cherrypy/test/static/404.html
 ${PYSITELIB}/cherrypy/test/static/dirback.jpg
 ${PYSITELIB}/cherrypy/test/static/index.html
 ${PYSITELIB}/cherrypy/test/style.css
@@ -309,10 +309,10 @@ ${PYSITELIB}/cherrypy/test/test_xmlrpc.pyo
 ${PYSITELIB}/cherrypy/test/webtest.py
 ${PYSITELIB}/cherrypy/test/webtest.pyc
 ${PYSITELIB}/cherrypy/test/webtest.pyo
-${PYSITELIB}/cherrypy/tutorial/README.txt
 ${PYSITELIB}/cherrypy/tutorial/__init__.py
 ${PYSITELIB}/cherrypy/tutorial/__init__.pyc
 ${PYSITELIB}/cherrypy/tutorial/__init__.pyo
+${PYSITELIB}/cherrypy/tutorial/README.rst
 ${PYSITELIB}/cherrypy/tutorial/custom_error.html
 ${PYSITELIB}/cherrypy/tutorial/pdf_file.pdf
 ${PYSITELIB}/cherrypy/tutorial/tut01_helloworld.py
@@ -346,12 +346,6 @@ ${PYSITELIB}/cherrypy/tutorial/tut10_http_errors.py
 ${PYSITELIB}/cherrypy/tutorial/tut10_http_errors.pyc
 ${PYSITELIB}/cherrypy/tutorial/tut10_http_errors.pyo
 ${PYSITELIB}/cherrypy/tutorial/tutorial.conf
-${PYSITELIB}/cherrypy/wsgiserver/__init__.py
-${PYSITELIB}/cherrypy/wsgiserver/__init__.pyc
-${PYSITELIB}/cherrypy/wsgiserver/__init__.pyo
-${PYSITELIB}/cherrypy/wsgiserver/ssl_builtin.py
-${PYSITELIB}/cherrypy/wsgiserver/ssl_builtin.pyc
-${PYSITELIB}/cherrypy/wsgiserver/ssl_builtin.pyo
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.py
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.pyc
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.pyo
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index f7dd91dc972..d350b52ddd9 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2016/09/12 17:44:14 adam Exp $
+$NetBSD: distinfo,v 1.12 2017/02/13 17:24:30 adam Exp $
 
-SHA1 (CherryPy-8.1.0.tar.gz) = f144c8508783d2c67a61f67cb5f5b6d5c657c38a
-RMD160 (CherryPy-8.1.0.tar.gz) = ab28a912e3f30456824b0d48aa67cc263b5aab98
-SHA512 (CherryPy-8.1.0.tar.gz) = 967374231337089bfa3f45ec1be9cf5b3f8b7040d78887a15aac298995218369ea6cb0127cac85af290aa45fe709e0e3c4e1a228b9559ba14054ac778ccca0fb
-Size (CherryPy-8.1.0.tar.gz) = 724428 bytes
+SHA1 (CherryPy-10.1.0.tar.gz) = a74bbc4d99b6bf01eef41899db56ad464bbc6890
+RMD160 (CherryPy-10.1.0.tar.gz) = 1f5458b77524749cb50a3c8fbfceff36a4986595
+SHA512 (CherryPy-10.1.0.tar.gz) = 2743b41e198fb52ebf9fb429f8c98529e2bbce57859bf1f751b31425747bd2429fcba0692ce8add6a235124908650f208ba1aedde32d7a175aec8c1fe8326096
+Size (CherryPy-10.1.0.tar.gz) = 687566 bytes