git: cb3588c798e6 - main - net/py-errbot: Update to 6.1.9

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 16 Jun 2022 14:06:25 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb3588c798e6d472ea576a07036f70e5eb784f6a

commit cb3588c798e6d472ea576a07036f70e5eb784f6a
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-06-16 14:00:10 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-06-16 14:00:10 +0000

    net/py-errbot: Update to 6.1.9
    
    Changes:        https://github.com/errbotio/errbot/blob/master/CHANGES.rst
---
 net/py-errbot/Makefile             | 44 +++++++++++----------
 net/py-errbot/distinfo             |  6 +--
 net/py-errbot/files/patch-setup.py | 78 ++++++++++++++++++++++++++++++++++----
 3 files changed, 98 insertions(+), 30 deletions(-)

diff --git a/net/py-errbot/Makefile b/net/py-errbot/Makefile
index 664ff28a462c..2d63641f934f 100644
--- a/net/py-errbot/Makefile
+++ b/net/py-errbot/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	errbot
-PORTVERSION=	6.1.8
+PORTVERSION=	6.1.9
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,18 +12,18 @@ COMMENT=	Chatbot designed to be simple to extend with plugins
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0:devel/py-ansi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}colorlog>=0:devel/py-colorlog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}daemonize>=0:devel/py-daemonize@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}deepmerge>=0.1.0:devel/py-deepmerge@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0.2.0:devel/py-ansi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorlog>=6.6.0:devel/py-colorlog@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}daemonize>=2.5.0:devel/py-daemonize@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}deepmerge>=1.0.1:devel/py-deepmerge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.19.16:devel/dulwich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>=3.3:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0.2:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}Flask>=2.0.2:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.1:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markdown>=3.3.6:textproc/py-markdown@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.9.0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=21.0.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.27.1:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}WebTest>=2.0.32:www/py-WebTest@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
@@ -36,11 +36,17 @@ SLACK-RTM_DESC=	Slack messaging support
 TELEGRAM_DESC=	Telegram messaging support
 XMPP_DESC=	XMPP messaging support
 
-IRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}irc>=0:irc/py-irc@${PY_FLAVOR}
-SLACK-RTM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slackclient>=2.0:net-im/py-slackclient@${PY_FLAVOR}
-TELEGRAM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-telegram-bot>=0:net-im/py-python-telegram-bot@${PY_FLAVOR}
-XMPP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}slixmpp>=0:net-im/py-slixmpp@${PY_FLAVOR}
+IRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}irc>=20.0.0:irc/py-irc@${PY_FLAVOR}
+SLACK-RTM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slackclient>=2.9.3:net-im/py-slackclient@${PY_FLAVOR}
+TELEGRAM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-telegram-bot>=13.10:net-im/py-python-telegram-bot@${PY_FLAVOR}
+XMPP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.8:devel/py-pyasn1@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.8:devel/py-pyasn1-modules@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}slixmpp>=1.7.1:net-im/py-slixmpp@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 30900
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}graphlib-backport>=1.0.3:graphics/py-graphlib-backport@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-errbot/distinfo b/net/py-errbot/distinfo
index cc72cdb87d9c..e4734f4d4229 100644
--- a/net/py-errbot/distinfo
+++ b/net/py-errbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624189697
-SHA256 (errbot-6.1.8.tar.gz) = e77dcbf0e787aed09f5a56d4f35645214aeaba60064527c1673cf2b346f15372
-SIZE (errbot-6.1.8.tar.gz) = 198777
+TIMESTAMP = 1655208298
+SHA256 (errbot-6.1.9.tar.gz) = 5994f3ef5cd645395d202e8522c41c2d0bca50e4e644efb278a9239e067029d5
+SIZE (errbot-6.1.9.tar.gz) = 196983
diff --git a/net/py-errbot/files/patch-setup.py b/net/py-errbot/files/patch-setup.py
index 85c91b609482..3c4075748a1e 100644
--- a/net/py-errbot/files/patch-setup.py
+++ b/net/py-errbot/files/patch-setup.py
@@ -1,10 +1,72 @@
---- setup.py.orig	2020-12-19 05:26:11 UTC
+--- setup.py.orig	2022-06-11 05:51:46 UTC
 +++ setup.py
-@@ -37,7 +37,6 @@ deps = [
-     'markdown>=3.3',
-     "ansi",
-     "Pygments>=2.0.2",
--    "pygments-markdown-lexer>=0.1.0.dev39",  # sytax coloring to debug md
-     "dulwich>=0.19.16",  # python implementation of git
-     "deepmerge>=0.1.0",
+@@ -27,23 +27,23 @@ if py_version < (3, 7):
+ VERSION_FILE = os.path.join("errbot", "version.py")
+ 
+ deps = [
+-    "webtest==3.0.0",
+-    "setuptools==60.5.0",
+-    "flask==2.0.2",
+-    "requests==2.27.1",
+-    "jinja2==3.0.3",
+-    "pyOpenSSL==21.0.0",
+-    "colorlog==6.6.0",
+-    "markdown==3.3.6",
+-    "ansi==0.2.0",
+-    "Pygments==2.11.2",
+-    "pygments-markdown-lexer==0.1.0.dev39",  # sytax coloring to debug md
+-    "dulwich==0.20.31",  # python implementation of git
+-    "deepmerge==1.0.1",
++    "webtest>=2.0.32",
++    "setuptools>=60.5.0",
++    "flask>=2.0.2",
++    "requests>=2.27.1",
++    "jinja2>=3.0.1",
++    "pyOpenSSL>=21.0.0",
++    "colorlog>=6.6.0",
++    "markdown>=3.3.6",
++    "ansi>=0.2.0",
++    "Pygments>=2.9.0",
++    "pygments-markdown-lexer>=0.1.0.dev39",  # sytax coloring to debug md
++    "dulwich>=0.19.16",  # python implementation of git
++    "deepmerge>=1.0.1",
  ]
+ 
+ if py_version < (3, 9):
+-    deps.append("graphlib-backport==1.0.3")
++    deps.append("graphlib-backport>=1.0.3")
+ 
+ src_root = os.curdir
+ 
+@@ -112,23 +112,23 @@ if __name__ == "__main__":
+         },
+         extras_require={
+             "IRC": [
+-                "irc==20.0.0",
++                "irc>=20.0.0",
+             ],
+             "slack": [
+-                "slackclient==1.3.2",
++                "slackclient>=1.3.2",
+             ],
+             "slack-rtm": [
+-                "slackclient==2.9.3",
++                "slackclient>=2.9.3",
+             ],
+             "telegram": [
+-                "python-telegram-bot==13.10",
++                "python-telegram-bot>=13.10",
+             ],
+             "XMPP": [
+-                "slixmpp==1.7.1",
+-                "pyasn1==0.4.8",
+-                "pyasn1-modules==0.2.8",
++                "slixmpp>=1.7.1",
++                "pyasn1>=0.4.8",
++                "pyasn1-modules>=0.2.8",
+             ],
+-            ':sys_platform!="win32"': ["daemonize==2.5.0"],
++            ':sys_platform!="win32"': ["daemonize>=2.5.0"],
+         },
+         author="errbot.io",
+         author_email="info@errbot.io",