diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index 4d4849b56ebe..41c72b43198c 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql13-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench doc src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=	libedit
 LIBEDIT_USES_OFF=readline
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql13-server/files/pkg-message-client.in b/databases/postgresql13-server/files/pkg-message-client.in
index 404124204b7d..e19a03f0c806 100644
--- a/databases/postgresql13-server/files/pkg-message-client.in
+++ b/databases/postgresql13-server/files/pkg-message-client.in
@@ -1,38 +1,38 @@
 [
 { type: install
   message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
   For all of the html documentation
 
 p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk 
   If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
 
 postgresql-odbc
   For client access from unix applications using ODBC as access
   method. Not needed to access unix PostgreSQL servers from Win32
   using ODBC. See below.
 
-ruby-postgres, py-psycopg2
+ruby-postgres, py-psycopg
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
 postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
   datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
 EOM
 }
 ]
diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile
index 965e37834a6d..6935b67ef80f 100644
--- a/databases/postgresql14-client/Makefile
+++ b/databases/postgresql14-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql14-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench doc src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=	libedit
 LIBEDIT_USES_OFF=readline
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql14-server/files/pkg-message-client.in b/databases/postgresql14-server/files/pkg-message-client.in
index 8cc91d484fcb..bb0ecefef696 100644
--- a/databases/postgresql14-server/files/pkg-message-client.in
+++ b/databases/postgresql14-server/files/pkg-message-client.in
@@ -1,38 +1,38 @@
 [
 { type: install
   message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
   For all of the html documentation
 
 p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk
   If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
 
 postgresql-odbc
   For client access from unix applications using ODBC as access
   method. Not needed to access unix PostgreSQL servers from Win32
   using ODBC. See below.
 
-ruby-postgres, py-psycopg2
+ruby-postgres, py-psycopg
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
 postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
   datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
 EOM
 }
 ]
diff --git a/databases/postgresql15-client/Makefile b/databases/postgresql15-client/Makefile
index dc5fd4c3da8e..e12ab2f37904 100644
--- a/databases/postgresql15-client/Makefile
+++ b/databases/postgresql15-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql15-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench doc src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=	libedit
 LIBEDIT_USES_OFF=readline
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-server/files/pkg-message-client.in b/databases/postgresql15-server/files/pkg-message-client.in
index 8cc91d484fcb..bb0ecefef696 100644
--- a/databases/postgresql15-server/files/pkg-message-client.in
+++ b/databases/postgresql15-server/files/pkg-message-client.in
@@ -1,38 +1,38 @@
 [
 { type: install
   message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
   For all of the html documentation
 
 p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk
   If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
 
 postgresql-odbc
   For client access from unix applications using ODBC as access
   method. Not needed to access unix PostgreSQL servers from Win32
   using ODBC. See below.
 
-ruby-postgres, py-psycopg2
+ruby-postgres, py-psycopg
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
 postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
   datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
 EOM
 }
 ]
diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile
index 7c4351eb7245..bbfa502bc076 100644
--- a/databases/postgresql16-client/Makefile
+++ b/databases/postgresql16-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql16-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench doc src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=	libedit
 LIBEDIT_USES_OFF=readline
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-server/files/pkg-message-client.in b/databases/postgresql16-server/files/pkg-message-client.in
index 8cc91d484fcb..bb0ecefef696 100644
--- a/databases/postgresql16-server/files/pkg-message-client.in
+++ b/databases/postgresql16-server/files/pkg-message-client.in
@@ -1,38 +1,38 @@
 [
 { type: install
   message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
   For all of the html documentation
 
 p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk
   If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
 
 postgresql-odbc
   For client access from unix applications using ODBC as access
   method. Not needed to access unix PostgreSQL servers from Win32
   using ODBC. See below.
 
-ruby-postgres, py-psycopg2
+ruby-postgres, py-psycopg
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
 postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
   datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
 EOM
 }
 ]
diff --git a/databases/postgresql17-client/Makefile b/databases/postgresql17-client/Makefile
index 81e677c1df2b..1d1b9592277a 100644
--- a/databases/postgresql17-client/Makefile
+++ b/databases/postgresql17-client/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql17-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=	libedit
 LIBEDIT_USES_OFF=readline
 BUILD_DEPENDS+=	docbook-xml>0:textproc/docbook-xml \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		xmllint:textproc/libxml2 \
 		xsltproc:textproc/libxslt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql17-server/files/pkg-message-client.in b/databases/postgresql17-server/files/pkg-message-client.in
index 8cc91d484fcb..bb0ecefef696 100644
--- a/databases/postgresql17-server/files/pkg-message-client.in
+++ b/databases/postgresql17-server/files/pkg-message-client.in
@@ -1,38 +1,38 @@
 [
 { type: install
   message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
   For all of the html documentation
 
 p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk
   If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
 
 postgresql-odbc
   For client access from unix applications using ODBC as access
   method. Not needed to access unix PostgreSQL servers from Win32
   using ODBC. See below.
 
-ruby-postgres, py-psycopg2
+ruby-postgres, py-psycopg
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
 postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
   datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
 EOM
 }
 ]