diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index e3bc7b54baa4..85383e3f8dbb 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	pgcli
 PORTVERSION=	4.4.0
+PORTREVISION=	1
 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>=61.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.4.0:devel/py-cli-helpers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=4.1<8.1.8:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=4.1<9: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} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=5.2:devel/py-tzlocal@${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.4.0:net/py-sshtunnel@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-pgcli/files/patch-pyproject.toml b/databases/py-pgcli/files/patch-pyproject.toml
index 890db139e03d..257b2cd7ea45 100644
--- a/databases/py-pgcli/files/patch-pyproject.toml
+++ b/databases/py-pgcli/files/patch-pyproject.toml
@@ -1,18 +1,30 @@
+Obtained from:	https://github.com/dbcli/pgcli/commit/d0a6cc2fe35186bc9616ecc61b5679ca7ee78b1d
+
 --- pyproject.toml.orig	2025-05-17 03:39:59 UTC
 +++ pyproject.toml
-@@ -65,7 +65,7 @@ dev = [
+@@ -25,7 +25,8 @@ dependencies = [
+ requires-python = ">=3.9"
+ dependencies = [
+     "pgspecial>=2.0.0",
+-    "click >= 4.1,<8.1.8",
++    # Click 8.1.8 through 8.3.0 have broken pager invocation for multi-argument PAGER values, which causes behave test failures.
++    "click >= 4.1, != 8.1.8, != 8.2.*, != 8.3.0, < 9",
+     "Pygments>=2.0",       # Pygments has to be Capitalcased.
+     # We still need to use pt-2 unless pt-3 released on Fedora32
+     # see: https://github.com/dbcli/pgcli/pull/1197
+@@ -65,7 +66,7 @@ dev = [
  ]
  
  [build-system]
 -requires = ["setuptools>=64.0", "setuptools-scm>=8"]
 +requires = ["setuptools>=61.0", "setuptools-scm>=8"]
  build-backend = "setuptools.build_meta"
  
  [tool.setuptools_scm]
-@@ -132,4 +132,4 @@ addopts = "--capture=sys --showlocals -rxs"
+@@ -132,4 +133,4 @@ addopts = "--capture=sys --showlocals -rxs"
  [tool.pytest.ini_options]
  minversion = "6.0"
  addopts = "--capture=sys --showlocals -rxs"
 -testpaths = ["tests"]
 \ No newline at end of file
 +testpaths = ["tests"]