git: 989d2b0befc9 - main - net/py-errbot: Update to 6.2.1

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 08 Jul 2026 13:40:57 UTC
The branch main has been updated by sunpoet:

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

commit 989d2b0befc97bc56e8e2772d886b1a12c3166ea
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2026-07-08 13:02:59 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2026-07-08 13:32:12 +0000

    net/py-errbot: Update to 6.2.1
    
    Changes:        https://github.com/errbotio/errbot/releases
                    https://github.com/errbotio/errbot/blob/master/CHANGES.rst
                    https://errbot.readthedocs.io/en/latest/#release-history
---
 net/py-errbot/Makefile             | 45 ++++++++++---------
 net/py-errbot/distinfo             |  6 +--
 net/py-errbot/files/patch-setup.py | 90 +++++++++++++++++++-------------------
 3 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/net/py-errbot/Makefile b/net/py-errbot/Makefile
index 08e98550a284..7b70571b3d5d 100644
--- a/net/py-errbot/Makefile
+++ b/net/py-errbot/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	errbot
-PORTVERSION=	6.2.0
-PORTREVISION=	2
+PORTVERSION=	6.2.1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,25 +14,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${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} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi>=0.3.7:devel/py-ansi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorlog>=6.10.1:devel/py-colorlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}daemonize>=2.5.0:devel/py-daemonize@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}deepmerge>=1.1.0:devel/py-deepmerge@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dulwich>=0.21.5: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}pyopenssl>=23.2.0,1:security/py-pyopenssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}webtest>=3.0.0:www/py-webtest@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}deepmerge>=2.0:devel/py-deepmerge@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dulwich>=1.2.1:devel/py-dulwich@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flask>=3.1.3:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.6:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markdown>=3.10.2:textproc/py-markdown@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.20.0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyopenssl>=26.1.0,1:security/py-pyopenssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.32.5:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}webtest>=3.0.7:www/py-webtest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	DISCORD IRC MATTERMOST SLACK TELEGRAM XMPP
+OPTIONS_DEFINE=	DISCORD IRC MATTERMOST SLACK TELEGRAM # XMPP
 DISCORD_DESC=	Discord messaging support
 IRC_DESC=	IRC messaging support
 MATTERMOST_DESC=Mattermost messaging support
@@ -42,12 +41,18 @@ TELEGRAM_DESC=	Telegram messaging support
 XMPP_DESC=	XMPP messaging support
 
 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}
+IRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}irc>=20.5.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}
+SLACK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}errbot-backend-slackv3>=0.3.2: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}
+XMPP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.6.3:devel/py-pyasn1@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.4.2:devel/py-pyasn1-modules@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}slixmpp>=1.15.0:net-im/py-slixmpp@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} >= 31300
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}legacy-cgi>=2.6.4:www/py-legacy-cgi@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-errbot/distinfo b/net/py-errbot/distinfo
index b1f755b6e33e..5417f5f6b985 100644
--- a/net/py-errbot/distinfo
+++ b/net/py-errbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708449414
-SHA256 (errbot-6.2.0.tar.gz) = 5f2ea3ac6e9d14d36ff98fe8a5d344570c6fb04d9b7a7ae4eb857a46fcdbaf04
-SIZE (errbot-6.2.0.tar.gz) = 176620
+TIMESTAMP = 1782966554
+SHA256 (errbot-6.2.1.tar.gz) = 0375e48587db82da28273e2430c658ad0edecc87f11a1978f5713feb19fcd845
+SIZE (errbot-6.2.1.tar.gz) = 179764
diff --git a/net/py-errbot/files/patch-setup.py b/net/py-errbot/files/patch-setup.py
index 98b13d3e3c74..4fcf88194e5d 100644
--- a/net/py-errbot/files/patch-setup.py
+++ b/net/py-errbot/files/patch-setup.py
@@ -1,51 +1,49 @@
---- setup.py.orig	2024-01-01 22:29:55 UTC
+--- setup.py.orig	2026-06-06 22:00:10 UTC
 +++ setup.py
-@@ -27,23 +27,23 @@ if py_version < (3, 8):
+@@ -27,20 +27,20 @@ deps = [
  VERSION_FILE = os.path.join("errbot", "version.py")
  
  deps = [
--    "webtest==3.0.0",
--    "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.21.5",  # python implementation of git
--    "deepmerge==1.1.0",
-+    "webtest>=3.0.0",
+-    "webtest==3.0.7",
+-    "setuptools>=78.1.1",
+-    "flask==3.1.3",
+-    "requests==2.32.5",
+-    "jinja2==3.1.6",
+-    "pyOpenSSL==26.1.0",
+-    "colorlog==6.10.1",
+-    "markdown==3.10.2",
+-    "ansi==0.3.7",
+-    "Pygments==2.20.0",
+-    "pygments-markdown-lexer==0.1.0.dev39",  # syntax coloring to debug md
+-    "dulwich==1.2.1",  # python implementation of git
+-    "deepmerge==2.0",
+-    "legacy-cgi==2.6.4; python_version >= '3.13'",  # stopgap fix for webtest after cgi dropped from stdlib in 3.13
++    "webtest>=3.0.7",
 +    "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.21.5",  # python implementation of git
-+    "deepmerge>=1.1.0",
++    "flask>=3.1.3",
++    "requests>=2.32.5",
++    "jinja2>=3.1.6",
++    "pyOpenSSL>=26.1.0",
++    "colorlog>=6.10.1",
++    "markdown>=3.10.2",
++    "ansi>=0.3.7",
++    "Pygments>=2.20.0",
++    "pygments-markdown-lexer>=0.1.0.dev39",  # syntax coloring to debug md
++    "dulwich>=1.2.1",  # python implementation of git
++    "deepmerge>=2.0",
++    "legacy-cgi>=2.6.4; python_version >= '3.13'",  # stopgap fix for webtest after cgi dropped from stdlib in 3.13
  ]
  
- if py_version < (3, 9):
--    deps.append("graphlib-backport==1.0.3")
-+    deps.append("graphlib-backport>=1.0.3")
- 
  src_root = os.curdir
- 
-@@ -112,24 +112,24 @@ if __name__ == "__main__":
+@@ -110,28 +110,28 @@ if __name__ == "__main__":
          },
          extras_require={
              "slack": [
--                "errbot-backend-slackv3==0.2.1",
-+                "errbot-backend-slackv3>=0.2.1",
+-                "errbot-backend-slackv3==0.3.2",
++                "errbot-backend-slackv3>=0.3.2",
              ],
              "discord": [
+                 # held at 3.0.1: 4.0 is a major bump on external backend; compat unverified
 -                "err-backend-discord==3.0.1",
 +                "err-backend-discord>=3.0.1",
              ],
@@ -54,20 +52,24 @@
 +                "err-backend-mattermost>=3.0.0",
              ],
              "IRC": [
--                "irc==20.3.0",
-+                "irc>=20.3.0",
+-                "irc==20.5.0",
++                "irc>=20.5.0",
              ],
              "telegram": [
+                 # held at 13.15: v20+ is fully async; backend would need a rewrite
 -                "python-telegram-bot==13.15",
 +                "python-telegram-bot>=13.15",
              ],
              "XMPP": [
--                "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",
+-                "slixmpp==1.15.0",
+-                "pyasn1==0.6.3",
+-                "pyasn1-modules==0.4.2",
++                "slixmpp>=1.15.0",
++                "pyasn1>=0.6.3",
++                "pyasn1-modules>=0.4.2",
              ],
-             ':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",