This diff updates www/py-cheroot to the latest version, and is needed
for bringing www/py-CherryPy to a more recent version. Overview on
changes can be found at
https://github.com/cherrypy/cheroot/blob/v8.2.1/CHANGES.rst.
This update adds a python3 flavor.
Please note that this update relies on several new ports, which will be
send to ports@ in separate mails.
Tested in combination with the update ot www/py-CherryPy.
Comments/OK?
diff --git Makefile Makefile
index 4faf9a1afa8..57a020652a8 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
COMMENT = high-performance, pure-Python HTTP server used by CherryPy
-MODPY_EGG_VERSION = 5.5.0
+MODPY_EGG_VERSION = 8.2.1
DISTNAME = cheroot-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = www
@@ -22,9 +21,19 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
-RUN_DEPENDS = devel/py-six${MODPY_FLAVOR}
+BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}>=1.15.0 \
+ devel/py-setuptools_scm_git_archive${MODPY_FLAVOR}>=1.0
+RUN_DEPENDS = devel/py-jaraco-functools${MODPY_FLAVOR} \
+ devel/py-more-itertools${MODPY_FLAVOR}>=2.6 \
+ devel/py-six${MODPY_FLAVOR}>=1.11.0
+
+.if !${FLAVOR:Mpython3}
+RUN_DEPENDS += devel/py-backports-functools-lru-cache
+.endif
NO_TEST = Yes
+post-install:
+ mv ${PREFIX}/bin/cheroot ${PREFIX}/bin/cheroot${MODPY_BIN_SUFFIX}
+
.include <bsd.port.mk>
diff --git distinfo distinfo
index 8cfb8c7427c..ff7f6110f02 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (cheroot-5.5.0.tar.gz) = WeNJ+RuSMJMPcHhka7krOlsPnPGab/lJd3QJ/SiaHro=
-SIZE (cheroot-5.5.0.tar.gz) = 56848
+SHA256 (cheroot-8.2.1.tar.gz) = W1JbPkp1Wt94Bwq1TBgh+4YNQlWpMX26K4jrLfJEHP8=
+SIZE (cheroot-8.2.1.tar.gz) = 89470
diff --git pkg/PLIST pkg/PLIST
index 51e1498a04b..6eeee25354e 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,21 +1,29 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/12 08:21:23 shadchin Exp $
+bin/cheroot${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/cheroot/
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/cheroot/__init__.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}connections.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}makefile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/${MODPY_PYCACHE}wsgi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/_compat.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/cli.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/connections.py
lib/python${MODPY_VERSION}/site-packages/cheroot/errors.py
lib/python${MODPY_VERSION}/site-packages/cheroot/makefile.py
lib/python${MODPY_VERSION}/site-packages/cheroot/server.py
@@ -31,23 +39,29 @@ lib/python${MODPY_VERSION}/site-packages/cheroot/test/
lib/python${MODPY_VERSION}/site-packages/cheroot/test/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}helper.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_config_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test__compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_conn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_http.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_wsgiapps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_dispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_makefile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}test_ssl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cheroot/test/${MODPY_PYCACHE}webtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/conftest.py
lib/python${MODPY_VERSION}/site-packages/cheroot/test/helper.py
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/test.pem
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_compat.py
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_config_server.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test__compat.py
lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_conn.py
lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_core.py
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_http.py
-lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_wsgiapps.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_dispatch.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_errors.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_makefile.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_server.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/test/test_ssl.py
lib/python${MODPY_VERSION}/site-packages/cheroot/test/webtest.py
+lib/python${MODPY_VERSION}/site-packages/cheroot/testing.py
lib/python${MODPY_VERSION}/site-packages/cheroot/workers/
lib/python${MODPY_VERSION}/site-packages/cheroot/workers/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cheroot/workers/${MODPY_PYCACHE}/
