diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index e7058f492b59..ed3b0740dfae 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	pgcli
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CLI for Postgres Database with auto-completion and syntax highlighting
 WWW=		https://www.pgcli.com/ \
 		https://github.com/dbcli/pgcli
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.1.1:devel/py-cli-helpers@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pgspecial>=2.0.0:databases/py-pgspecial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=2.0.6<4.0.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg>=3.0.14:databases/py-psycopg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.6:databases/py-sqlparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sshtunnel>=0:net/py-sshtunnel@${PY_FLAVOR}
 
 USES=		pgsql python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 PYTEST_BROKEN_TESTS=	test_obfuscate_process_password
 
 OPTIONS_DEFINE=	KEYRING SSHTUNNEL
 KEYRING_DESC=	keyring support
 SSHTUNNEL_DESC=	SSH tunnel support
 
 KEYRING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>=12.2.0,1:security/py-keyring@${PY_FLAVOR}
 SSHTUNNEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sshtunnel>=0:net/py-sshtunnel@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-pgcli/distinfo b/databases/py-pgcli/distinfo
index 0b2a5a43174e..44657dd30741 100644
--- a/databases/py-pgcli/distinfo
+++ b/databases/py-pgcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715842650
-SHA256 (pgcli-4.1.0.tar.gz) = 3fd16c8b51bd0145ff618c2c73264bcd854ba866aa206d4f076851f641b9b215
-SIZE (pgcli-4.1.0.tar.gz) = 145165
+TIMESTAMP = 1742070316
+SHA256 (pgcli-4.2.0.tar.gz) = 0d3ed9916f3bbe245c283bf484453080ff00227ab085660c6cfbb0ec53f2e9e6
+SIZE (pgcli-4.2.0.tar.gz) = 145922
diff --git a/databases/py-pgcli/files/patch-pyproject.toml b/databases/py-pgcli/files/patch-pyproject.toml
new file mode 100644
index 000000000000..8b7ea09ca03e
--- /dev/null
+++ b/databases/py-pgcli/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2025-03-06 00:32:42 UTC
++++ pyproject.toml
+@@ -49,7 +49,7 @@ keyring = ["keyring >= 12.2.0"]
+ 
+ [project.optional-dependencies]
+ keyring = ["keyring >= 12.2.0"]
+-sshtunnel = ["sshtunnel >= 0.4.0"]
++sshtunnel = ["sshtunnel"]
+ 
+ [build-system]
+ requires = ["setuptools>=61.2"]
diff --git a/databases/py-pgcli/files/patch-setup.py b/databases/py-pgcli/files/patch-setup.py
deleted file mode 100644
index 7ab0eab96497..000000000000
--- a/databases/py-pgcli/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2024-05-10 03:17:53 UTC
-+++ setup.py
-@@ -44,7 +44,7 @@ setup(
-     ],
-     extras_require={
-         "keyring": ["keyring >= 12.2.0"],
--        "sshtunnel": ["sshtunnel >= 0.4.0"],
-+        "sshtunnel": ["sshtunnel"],
-     },
-     python_requires=">=3.8",
-     entry_points="""