diff --git a/devel/commitizen/Makefile b/devel/commitizen/Makefile
index 12eb71dfea76..36f00345734b 100644
--- a/devel/commitizen/Makefile
+++ b/devel/commitizen/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	commitizen
 PORTVERSION=	3.27.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Commitizen client tool written in Python
@@ -11,21 +12,18 @@ WWW=		https://commitizen-tools.github.io/commitizen/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PY_BDEPS=	poetry-core>0:devel/py-poetry-core
-PY_RDEPS=	Jinja2>=2.10.3:devel/py-Jinja2 \
-		argcomplete>=1.12.1:devel/py-argcomplete \
-		charset-normalizer>=2.1.0:textproc/py-charset-normalizer \
-		colorama>=0.4.1:devel/py-colorama \
-		decli>=0.6.0:devel/py-decli \
-		importlib-metadata>=4.13:devel/py-importlib-metadata \
-		packaging>=19:devel/py-packaging \
-		pyyaml>=3.08:devel/py-pyyaml \
-		prompt-toolkit>0:devel/py-prompt-toolkit \
-		questionary>=1.9:devel/py-questionary \
-		termcolor>=1.1:devel/py-termcolor \
-		tomlkit>=0.5.3:textproc/py-tomlkit
-BUILD_DEPENDS=	${PY_BDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
-RUN_DEPENDS=	${PY_RDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.12.1:devel/py-argcomplete@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.1.0<4:textproc/py-charset-normalizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1<0.5:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}decli>=0.6.0<0.7:devel/py-decli@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.13<8:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.08:devel/py-pyyaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}questionary>=2.0<3:devel/py-questionary@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1<3:devel/py-termcolor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.5.3<1.0.0:textproc/py-tomlkit@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
diff --git a/devel/commitizen/files/patch-pyproject.toml b/devel/commitizen/files/patch-pyproject.toml
new file mode 100644
index 000000000000..04028ad67d20
--- /dev/null
+++ b/devel/commitizen/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2024-05-22 03:06:15 UTC
++++ pyproject.toml
+@@ -47,7 +47,7 @@ pyyaml = ">=3.08"
+ tomlkit = ">=0.5.3,<1.0.0"
+ jinja2 = ">=2.10.3"
+ pyyaml = ">=3.08"
+-argcomplete = ">=1.12.1,<3.4"
++argcomplete = ">=1.12.1"
+ typing-extensions = { version = "^4.0.1", python = "<3.8" }
+ charset-normalizer = ">=2.1.0,<4"
+ # Use the Python 3.11 and 3.12 compatible API: https://github.com/python/importlib_metadata#compatibility