diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile
index 11359088451d..df7b3ee92a4d 100644
--- a/databases/postgresql14-client/Makefile
+++ b/databases/postgresql14-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql14-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/fe_utils 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-contrib/Makefile b/databases/postgresql14-contrib/Makefile
index cc49bb514af0..e60bf88b53b4 100644
--- a/databases/postgresql14-contrib/Makefile
+++ b/databases/postgresql14-contrib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	postgresql
-REVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql14-server
 
 USES=		bison pgsql:${PORTVERSION:R}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS OPENSSL XML
 OPTIONS_DEFAULT=OPENSSL XML
 OPTIONS_SUB=	yes
 
 OPENSSL_DESC=		Build with OpenSSL support
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 XML_CONFIGURE_WITH=	libxslt libxml
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
 post-configure:
 	@cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql14-plperl/Makefile b/databases/postgresql14-plperl/Makefile
index 64558c042265..3cb6e894c99e 100644
--- a/databases/postgresql14-plperl/Makefile
+++ b/databases/postgresql14-plperl/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=14
 
 USES+=		perl5 readline
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql14-plpython/Makefile b/databases/postgresql14-plpython/Makefile
index 26645c55192b..47c468226bdc 100644
--- a/databases/postgresql14-plpython/Makefile
+++ b/databases/postgresql14-plpython/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=	14
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
 SLAVE_ONLY=	yes
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql14-pltcl/Makefile b/databases/postgresql14-pltcl/Makefile
index 44b3c1cf1bfb..d7468f28f0ca 100644
--- a/databases/postgresql14-pltcl/Makefile
+++ b/databases/postgresql14-pltcl/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=14
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 21128404f324..c276e7184afd 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	14.21
+DISTVERSION?=	14.22
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index dd139b827a9c..4a61b639cdd7 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770716740
-SHA256 (postgresql/postgresql-14.21.tar.bz2) = 5b30f19347efff32b6e09ed2cdff0b04e9aee913ec9bb7414de2b7c17b17f1f9
-SIZE (postgresql/postgresql-14.21.tar.bz2) = 22535378
+TIMESTAMP = 1771928563
+SHA256 (postgresql/postgresql-14.22.tar.bz2) = f57938ad30067077720277f6d7db05aafc07d1545efd2ed82f199ba828a7ad34
+SIZE (postgresql/postgresql-14.22.tar.bz2) = 22534388
diff --git a/databases/postgresql15-client/Makefile b/databases/postgresql15-client/Makefile
index 85ecd23d2055..7ece428a2873 100644
--- a/databases/postgresql15-client/Makefile
+++ b/databases/postgresql15-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql15-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/fe_utils 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-contrib/Makefile b/databases/postgresql15-contrib/Makefile
index 029971d32399..8d8803e14f03 100644
--- a/databases/postgresql15-contrib/Makefile
+++ b/databases/postgresql15-contrib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql15-server
 
 USES=		bison pgsql:${PORTVERSION:R}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS OPENSSL XML
 OPTIONS_DEFAULT=OPENSSL XML
 OPTIONS_SUB=	yes
 
 OPENSSL_DESC=		Build with OpenSSL support
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 XML_CONFIGURE_WITH=	libxslt libxml
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
 post-configure:
 	@cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-plperl/Makefile b/databases/postgresql15-plperl/Makefile
index 9460a1e7b67c..996289b0b187 100644
--- a/databases/postgresql15-plperl/Makefile
+++ b/databases/postgresql15-plperl/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=15
 
 USES+=		perl5 readline
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-plpython/Makefile b/databases/postgresql15-plpython/Makefile
index c390f7bed4aa..5545b860c18b 100644
--- a/databases/postgresql15-plpython/Makefile
+++ b/databases/postgresql15-plpython/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=	15
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
 SLAVE_ONLY=	yes
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-pltcl/Makefile b/databases/postgresql15-pltcl/Makefile
index 3da7763ea7d8..497032f0d07b 100644
--- a/databases/postgresql15-pltcl/Makefile
+++ b/databases/postgresql15-pltcl/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=15
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index f8dddea5f594..5c2fed7f8fc7 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	15.16
+DISTVERSION?=	15.17
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
index 4afa19d30c4b..b39fa3c55f04 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770716757
-SHA256 (postgresql/postgresql-15.16.tar.bz2) = 695ee29a77be1f5010e10f3667696f29871587f7aa311eadc1f809bea287cf48
-SIZE (postgresql/postgresql-15.16.tar.bz2) = 23350381
+TIMESTAMP = 1771928564
+SHA256 (postgresql/postgresql-15.17.tar.bz2) = ae14f24c14727e0b2ded1c5553031666099bd1054db3ef44bfa6e2bd6d554a56
+SIZE (postgresql/postgresql-15.17.tar.bz2) = 23357238
diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile
index e258a7b3e917..538bb135dec0 100644
--- a/databases/postgresql16-client/Makefile
+++ b/databases/postgresql16-client/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	postgresql
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql16-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/fe_utils 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-contrib/Makefile b/databases/postgresql16-contrib/Makefile
index e68f712cb309..cd8376580200 100644
--- a/databases/postgresql16-contrib/Makefile
+++ b/databases/postgresql16-contrib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql16-server
 
 USES=		bison pgsql:${PORTVERSION:R}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS OPENSSL XML
 OPTIONS_DEFAULT=OPENSSL XML
 OPTIONS_SUB=	yes
 
 OPENSSL_DESC=		Build with OpenSSL support
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 XML_CONFIGURE_WITH=	libxslt libxml
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
 post-configure:
 	@cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plperl/Makefile b/databases/postgresql16-plperl/Makefile
index 16021221c1e7..11fb616ea16c 100644
--- a/databases/postgresql16-plperl/Makefile
+++ b/databases/postgresql16-plperl/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=16
 
 USES+=		perl5 readline
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plpython/Makefile b/databases/postgresql16-plpython/Makefile
index 4b9d332abe96..5f68bc60a927 100644
--- a/databases/postgresql16-plpython/Makefile
+++ b/databases/postgresql16-plpython/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=	16
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
 SLAVE_ONLY=	yes
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-pltcl/Makefile b/databases/postgresql16-pltcl/Makefile
index 6356c01ad4b9..e0c84196b3c5 100644
--- a/databases/postgresql16-pltcl/Makefile
+++ b/databases/postgresql16-pltcl/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=16
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index a93ea275a752..72b2b4d377d4 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	16.12
+DISTVERSION?=	16.13
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
index a1dca8232e51..b6939042847d 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770716758
-SHA256 (postgresql/postgresql-16.12.tar.bz2) = b253ee949303ef5df00e24002600da4fb37e5ccfafa78718c6ea6a936b4d97f1
-SIZE (postgresql/postgresql-16.12.tar.bz2) = 25055882
+TIMESTAMP = 1771928565
+SHA256 (postgresql/postgresql-16.13.tar.bz2) = dc2ddbbd245c0265a689408e3d2f2f3f9ba2da96bd19318214b313cdd9797287
+SIZE (postgresql/postgresql-16.13.tar.bz2) = 25051306
diff --git a/databases/postgresql17-client/Makefile b/databases/postgresql17-client/Makefile
index 9b287fddba31..2d8399f6d0fa 100644
--- a/databases/postgresql17-client/Makefile
+++ b/databases/postgresql17-client/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	postgresql
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql17-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/fe_utils 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-contrib/Makefile b/databases/postgresql17-contrib/Makefile
index 001c798933c8..1a55a4cc9a46 100644
--- a/databases/postgresql17-contrib/Makefile
+++ b/databases/postgresql17-contrib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql17-server
 
 USES=		bison pgsql:${PORTVERSION:R}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS OPENSSL XML
 OPTIONS_DEFAULT=OPENSSL XML
 OPTIONS_SUB=	yes
 
 OPENSSL_DESC=		Build with OpenSSL support
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 XML_CONFIGURE_WITH=	libxslt libxml
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
 post-configure:
 	@cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql17-plperl/Makefile b/databases/postgresql17-plperl/Makefile
index 3e4936e25dae..1de271ecbaf0 100644
--- a/databases/postgresql17-plperl/Makefile
+++ b/databases/postgresql17-plperl/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=17
 
 USES=		readline
 USE_PERL5=	run
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql17-plpython/Makefile b/databases/postgresql17-plpython/Makefile
index de572c2ab87e..6fc9a43b1551 100644
--- a/databases/postgresql17-plpython/Makefile
+++ b/databases/postgresql17-plpython/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=	17
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
 SLAVE_ONLY=	yes
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql17-pltcl/Makefile b/databases/postgresql17-pltcl/Makefile
index 8a52fd957a34..7759f6045000 100644
--- a/databases/postgresql17-pltcl/Makefile
+++ b/databases/postgresql17-pltcl/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=17
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index 1ce45c1f5c01..041ff655e4df 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	17.8
+DISTVERSION?=	17.9
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums src/bin/pg_combinebackup \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_walsummary src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql17-server/distinfo b/databases/postgresql17-server/distinfo
index 04d458440fc0..18c20f0f9982 100644
--- a/databases/postgresql17-server/distinfo
+++ b/databases/postgresql17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770716759
-SHA256 (postgresql/postgresql-17.8.tar.bz2) = a88d195dd93730452d0cfa1a11896720d6d1ba084bc2be7d7fc557fa4e4158a0
-SIZE (postgresql/postgresql-17.8.tar.bz2) = 21637088
+TIMESTAMP = 1771928567
+SHA256 (postgresql/postgresql-17.9.tar.bz2) = 3b9a62538a8da151e807a3ddb1198e8605f2032544d78f403ae883d27ecf1ee4
+SIZE (postgresql/postgresql-17.9.tar.bz2) = 21648916
diff --git a/databases/postgresql18-client/Makefile b/databases/postgresql18-client/Makefile
index 5dabf9060252..a8997543b326 100644
--- a/databases/postgresql18-client/Makefile
+++ b/databases/postgresql18-client/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql18-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port src/fe_utils 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/postgresql18-contrib/Makefile b/databases/postgresql18-contrib/Makefile
index 63ab398118a1..9a73e8733994 100644
--- a/databases/postgresql18-contrib/Makefile
+++ b/databases/postgresql18-contrib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql18-server
 
 USES=		bison pgsql:${PORTVERSION:R}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS OPENSSL XML
 OPTIONS_DEFAULT=OPENSSL XML
 OPTIONS_SUB=	yes
 
 OPENSSL_DESC=		Build with OpenSSL support
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 XML_CONFIGURE_WITH=	libxslt libxml
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
 post-configure:
 	@cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql18-plperl/Makefile b/databases/postgresql18-plperl/Makefile
index e9b808311720..9a5f3dbff77b 100644
--- a/databases/postgresql18-plperl/Makefile
+++ b/databases/postgresql18-plperl/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=18
 
 USES=		readline
 USE_PERL5=	run
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql18-plpython/Makefile b/databases/postgresql18-plpython/Makefile
index 0dcbdb2a2693..435c54cdbc2e 100644
--- a/databases/postgresql18-plpython/Makefile
+++ b/databases/postgresql18-plpython/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=	18
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend ${INSTALL_DIRS}
 INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
 SLAVE_ONLY=	yes
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql18-pltcl/Makefile b/databases/postgresql18-pltcl/Makefile
index e80188aed588..3510c70c4ec6 100644
--- a/databases/postgresql18-pltcl/Makefile
+++ b/databases/postgresql18-pltcl/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
 WANT_PGSQL_VER?=18
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql18-server/Makefile b/databases/postgresql18-server/Makefile
index a098b6ddf7a8..d1482183291c 100644
--- a/databases/postgresql18-server/Makefile
+++ b/databases/postgresql18-server/Makefile
@@ -1,260 +1,260 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	18.2
+DISTVERSION?=	18.3
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
 WWW=		https://www.postgresql.org/
 
 LICENSE=	PostgreSQL
 
 CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
 OPTIONS_SUB=	yes
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
 USES+=		tar:bzip2 cpe
 .if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
 USES+=		bison perl5
 USE_PERL5+=	build
 .endif
 
 .if !defined(NO_BUILD)
 USES+=		gmake
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 .endif
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
 LDFLAGS+=	-lpthread
 MAKE_ENV=	MAKELEVEL=0
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums src/bin/pg_combinebackup \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_walsummary src/bin/pg_upgrade
 
 BUILD_DIRS?=	src/port ${INSTALL_DIRS}
 INSTALL_TARGET?=install-strip
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 COMPONENT=	-server
 USE_RC_SUBR=	postgresql
 USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
 GROUPS=		${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 
 .if defined(SERVER_ONLY)
 OPTIONS_DEFINE=	DTRACE LDAP TZDATA XML DOCS
 OPTIONS_DEFAULT+=XML
 LDAP_DESC=	Build with LDAP authentication support
 TZDATA_DESC=	Use internal timezone database
 XML_DESC=	Build with XML data type
 
 DTRACE_CONFIGURE_ENABLE=dtrace
 DTRACE_LDFLAGS=		-lelf
 DTRACE_INSTALL_TARGET=	install
 
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
 OPTIONS_DEFINE+=	LZ4
 OPTIONS_DEFAULT+=	LZ4
 LZ4_DESC=		Build with LZ4 compression support
 LZ4_CONFIGURE_WITH=	lz4
 LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
 .  endif
 
 OPTIONS_DEFINE+=	LLVM
 OPTIONS_DEFAULT+=	LLVM
 LLVM_DESC=		Build with support for JIT-compiling expressions
 LLVM_CONFIGURE_WITH=	llvm
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
 			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
 LLVM_USES=		llvm:lib
 
 CONFIGURE_ARGS+=	--with-icu
 LIB_DEPENDS+=		libicudata.so:devel/icu
 USES+=			pkgconfig
 .else
 CONFIGURE_ARGS+=	--without-icu
 .endif
 
 
 .if !defined(SLAVE_ONLY)
 OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
 NLS_DESC=		Use internationalized messages
 PAM_DESC=		Build with PAM Support
 GSSAPI_DESC=		Build with GSSAPI from base (security/krb5)
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 SSL_DESC=		Build with OpenSSL support
 
 OPTIONS_DEFAULT+=	SSL
 
 GSSAPI_USES=		gssapi:mit
 GSSAPI_CONFIGURE_WITH=	gssapi
 
 PATCH_DIST_STRIP=-p1
 .endif # !SLAVE_ONLY
 
 .if defined(SERVER_ONLY) || defined(CLIENT_ONLY) || ${COMPONENT} == "-contrib"
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
 OPTIONS_DEFINE+=	ZSTD
 OPTIONS_DEFAULT+=	ZSTD
 ZSTD_DESC=		Build with ZSTD compression support
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 USES+=			pkgconfig
 .  endif
 .endif
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USES=		ldap
 
 OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
 			PG_USER=${PG_USER} \
 			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
 			PG_GROUP=${PG_GROUP} \
 			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
 SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
 			PG_GROUP=${PG_GROUP} \
 			PG_USER=${PG_USER} \
 			PG_UID=${PG_UID}
 
 .include <bsd.port.options.mk>
 
 # i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
 # For such ancient CPUs, gcc must be used to build PostgreSQL.
 # https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
 .if ${ARCH} == "i386"
 CFLAGS+=	-msse2
 .endif
 
 # For testing files in FILESDIR
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLLVM}
 INSTALL_DIRS+=		src/backend/jit/llvm
 .endif
 
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD) && !target(do-build)
 
 do-build:
 	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
 	done
 .  if defined(CLIENT_ONLY)
 .    if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
 	@ cd ${WRKSRC}/doc && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} man
 .    endif
 .  endif
 .  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
 SUB_FILES+=	pkg-message${COMPONENT}
 PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
 .  endif
 .  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
 SUB_FILES+=	pkg-install${COMPONENT}
 .  endif
 
 post-patch:
 .  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
 	@${REINPLACE_CMD} \
 		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
 		${WRKSRC}/src/interfaces/libpq/Makefile
 .  endif
 
 do-install:
 	for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
 			${STAGEDIR}${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*.so
 	cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 .    if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
 	cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
 .    endif
 .  endif
 .  if defined(SLAVE_ONLY)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 .  endif
 	if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql18-server/distinfo b/databases/postgresql18-server/distinfo
index 4cf44f5dd60e..f86b9e1581c6 100644
--- a/databases/postgresql18-server/distinfo
+++ b/databases/postgresql18-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770716760
-SHA256 (postgresql/postgresql-18.2.tar.bz2) = 5245bd1b79700d55b8e0575be0325ef61e7bbef627e6a616e4cf36ad4687be36
-SIZE (postgresql/postgresql-18.2.tar.bz2) = 22492584
+TIMESTAMP = 1771928568
+SHA256 (postgresql/postgresql-18.3.tar.bz2) = d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f
+SIZE (postgresql/postgresql-18.3.tar.bz2) = 22497924