net/py-errbot: Update to 6.2.0

- Update WWW
- Adjust options:
  - Add DISCORD, MATTERMOST and SLACK options
  - Remove SLACK_RTM option

Changes:	https://github.com/errbotio/errbot/releases
		https://github.com/errbotio/errbot/blob/master/CHANGES.rst
		https://errbot.readthedocs.io/en/latest/#release-history

3 files changed, 75 insertions, 70 deletions

diff --git a/net/py-errbot/Makefile b/net/py-errbot/Makefile
index e443c3c7bfb6..e768d1e80202 100644
--- a/net/py-errbot/Makefile
+++ b/net/py-errbot/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	errbot
-PORTVERSION=	6.1.9
-PORTREVISION=	4
+PORTVERSION=	6.2.0
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Chatbot designed to be simple to extend with plugins
-WWW=		https://github.com/errbotio/errbot
+WWW=		https://errbot.readthedocs.io/en/latest/ \
+		https://github.com/errbotio/errbot
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0.2.0:devel/py-ansi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}colorlog>=6.6.0:devel/py-colorlog@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0.3.6:devel/py-ansi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorlog>=6.7.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.20.31:devel/py-dulwich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flask>=2.0.2:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.3:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>=3.3.6:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.11.2:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}openssl>=21.0.0,1:security/py-openssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.27.1:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}deepmerge>=1.1.0:devel/py-deepmerge@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dulwich>=0.21.2:devel/py-dulwich@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flask>=2.3.3:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markdown>=3.4.4:textproc/py-markdown@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.16.1:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=23.2.0,1:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webtest>=3.0.0:www/py-webtest@${PY_FLAVOR}
 
 USES=		python
@@ -30,18 +30,22 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	IRC SLACK_RTM TELEGRAM XMPP
+OPTIONS_DEFINE=	DISCORD IRC MATTERMOST SLACK TELEGRAM XMPP
+DISCORD_DESC=	Discord messaging support
 IRC_DESC=	IRC messaging support
-SLACK-RTM_DESC=	Slack messaging support
+MATTERMOST_DESC=Mattermost messaging support
+SLACK_DESC=	Slack messaging support
 TELEGRAM_DESC=	Telegram messaging support
 XMPP_DESC=	XMPP messaging support
 
-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}
+DISCORD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}err-backend-discord>=3.0.1:net/py-err-backend-discord@${PY_FLAVOR}
+IRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}irc>=20.3.0:irc/py-irc@${PY_FLAVOR}
+MATTERMOST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}err-backend-mattermost>=3.0.0:net/py-err-backend-mattermost@${PY_FLAVOR}
+SLACK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}errbot-backend-slackv3>=0.2.1:net/py-errbot-backend-slackv3@${PY_FLAVOR}
+TELEGRAM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-telegram-bot>=13.15:net-im/py-python-telegram-bot@${PY_FLAVOR}
+XMPP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.5.0:devel/py-pyasn1@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.3.0:devel/py-pyasn1-modules@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}slixmpp>=1.8.4:net-im/py-slixmpp@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/py-errbot/distinfo b/net/py-errbot/distinfo
index e4734f4d4229..b1f755b6e33e 100644
--- a/net/py-errbot/distinfo
+++ b/net/py-errbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655208298
-SHA256 (errbot-6.1.9.tar.gz) = 5994f3ef5cd645395d202e8522c41c2d0bca50e4e644efb278a9239e067029d5
-SIZE (errbot-6.1.9.tar.gz) = 196983
+TIMESTAMP = 1708449414
+SHA256 (errbot-6.2.0.tar.gz) = 5f2ea3ac6e9d14d36ff98fe8a5d344570c6fb04d9b7a7ae4eb857a46fcdbaf04
+SIZE (errbot-6.2.0.tar.gz) = 176620
diff --git a/net/py-errbot/files/patch-setup.py b/net/py-errbot/files/patch-setup.py
index 0e2819626fda..5ccf2ccb9f60 100644
--- a/net/py-errbot/files/patch-setup.py
+++ b/net/py-errbot/files/patch-setup.py
@@ -1,35 +1,35 @@
---- setup.py.orig	2022-06-11 05:51:46 UTC
+--- setup.py.orig	2024-01-01 22:29:55 UTC
 +++ setup.py
-@@ -27,23 +27,23 @@ if py_version < (3, 7):
+@@ -27,23 +27,23 @@ if py_version < (3, 8):
  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",
+-    "setuptools==68.1.2",
+-    "flask==2.3.3",
+-    "requests==2.31.0",
+-    "jinja2==3.1.2",
+-    "pyOpenSSL==23.2.0",
+-    "colorlog==6.7.0",
+-    "markdown==3.4.4",
+-    "ansi==0.3.6",
+-    "Pygments==2.16.1",
 -    "pygments-markdown-lexer==0.1.0.dev39",  # sytax coloring to debug md
--    "dulwich==0.20.31",  # python implementation of git
--    "deepmerge==1.0.1",
+-    "dulwich==0.21.5",  # python implementation of git
+-    "deepmerge==1.1.0",
 +    "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",
++    "setuptools>=61",
++    "flask>=2.3.3",
++    "requests>=2.31.0",
++    "jinja2>=3.1.2",
++    "pyOpenSSL>=23.2.0",
++    "colorlog>=6.7.0",
++    "markdown>=3.4.4",
++    "ansi>=0.3.6",
++    "Pygments>=2.16.1",
 +    "pygments-markdown-lexer>=0.1.0.dev39",  # sytax coloring to debug md
-+    "dulwich>=0.20.31",  # python implementation of git
-+    "deepmerge>=1.0.1",
++    "dulwich>=0.21.2",  # python implementation of git
++    "deepmerge>=1.1.0",
  ]
  
  if py_version < (3, 9):
@@ -38,35 +38,36 @@
  
  src_root = os.curdir
  
-@@ -112,23 +112,23 @@ if __name__ == "__main__":
+@@ -112,24 +112,24 @@ if __name__ == "__main__":
          },
          extras_require={
-             "IRC": [
--                "irc==20.0.0",
-+                "irc>=20.0.0",
-             ],
              "slack": [
--                "slackclient==1.3.2",
-+                "slackclient>=1.3.2",
+-                "errbot-backend-slackv3==0.2.1",
++                "errbot-backend-slackv3>=0.2.1",
+             ],
+             "discord": [
+-                "err-backend-discord==3.0.1",
++                "err-backend-discord>=3.0.1",
              ],
-             "slack-rtm": [
--                "slackclient==2.9.3",
-+                "slackclient>=2.9.3",
+             "mattermost": [
+-                "err-backend-mattermost==3.0.0",
++                "err-backend-mattermost>=3.0.0",
+             ],
+             "IRC": [
+-                "irc==20.3.0",
++                "irc>=20.3.0",
              ],
              "telegram": [
--                "python-telegram-bot==13.10",
-+                "python-telegram-bot>=13.10",
+-                "python-telegram-bot==13.15",
++                "python-telegram-bot>=13.15",
              ],
              "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",
+-                "slixmpp==1.8.4",
+-                "pyasn1==0.5.0",
+-                "pyasn1-modules==0.3.0",
++                "slixmpp>=1.8.4",
++                "pyasn1>=0.5.0",
++                "pyasn1-modules>=0.3.0",
              ],
--            ':sys_platform!="win32"': ["daemonize==2.5.0"],
-+            ':sys_platform!="win32"': ["daemonize>=2.5.0"],
+             ':sys_platform!="win32"': ["daemonize==2.5.0"],
          },
-         author="errbot.io",
-         author_email="info@errbot.io",