diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 064a9ec1ba88..329da9b96264 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	13.18
+DISTVERSION?=	13.19
 # 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}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo
index 4909a3ea7cb5..7ecf676fdd4d 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732004003
-SHA256 (postgresql/postgresql-13.18.tar.bz2) = ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1
-SIZE (postgresql/postgresql-13.18.tar.bz2) = 21687645
+TIMESTAMP = 1739277660
+SHA256 (postgresql/postgresql-13.19.tar.bz2) = 482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea
+SIZE (postgresql/postgresql-13.19.tar.bz2) = 21729020
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 9f8055f04052..3f503eaef227 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	14.15
+DISTVERSION?=	14.16
 # 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}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index 0a9b1f062bf6..8e5538ebe19c 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732004004
-SHA256 (postgresql/postgresql-14.15.tar.bz2) = 02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5
-SIZE (postgresql/postgresql-14.15.tar.bz2) = 22458243
+TIMESTAMP = 1739277661
+SHA256 (postgresql/postgresql-14.16.tar.bz2) = 673c26f15ebb14306ad0ea051d8acfb3915dd342de942f5b502e5354a0ab760c
+SIZE (postgresql/postgresql-14.16.tar.bz2) = 22491073
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index 9f28e60a756a..8a241425839a 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	15.10
+DISTVERSION?=	15.11
 # 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}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
index 8e18bebef22f..6edb93347405 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732004005
-SHA256 (postgresql/postgresql-15.10.tar.bz2) = 55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573
-SIZE (postgresql/postgresql-15.10.tar.bz2) = 23138615
+TIMESTAMP = 1739277663
+SHA256 (postgresql/postgresql-15.11.tar.bz2) = 5367e97e81e493301cc4aab049dfbc9b4913822985bc62379faab2a281cfbdf0
+SIZE (postgresql/postgresql-15.11.tar.bz2) = 23167652
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 61b7ddeaa5ea..c64f66d9fe06 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,273 +1,242 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	16.6
+DISTVERSION?=	16.7
 # 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 !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_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
 
 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
 
 .  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
 .  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:min=11,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
-KRB5_DESC=		Build with kerberos provider support
 NLS_DESC=		Use internationalized messages
 PAM_DESC=		Build with PAM Support
-MIT_KRB5_DESC=		Build with MIT kerberos support
-HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
-GSSAPI_DESC=		Build with GSSAPI 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
 .endif # !SLAVE_ONLY
 
 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
 
 .if !defined(SLAVE_ONLY)
-
 PATCH_DIST_STRIP=-p1
-
-.if ${PORT_OPTIONS:MGSSAPI}
-.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
-# Kerberos libraries will pull the proper GSSAPI library
-# via linker dependencies, but otherwise we must specify
-# it explicitely: ld --as-needed is used for compilation,
-# so configure's -lgssapi_krb5 won't go.
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-.endif
-.endif
-
-.  if ${PORT_OPTIONS:MMIT_KRB5}
-.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
-IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
-.   else
-CONFIGURE_ARGS+=--with-krb5
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so.3:security/krb5
-.    endif
-.   endif
-.  endif
-
-.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
-CONFIGURE_ARGS+=--with-krb5
-.  endif
-
 .endif # !SLAVE_ONLY
 
 # 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 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)
 	@ ${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)
 	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 .  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/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
index c5bccd434b11..92f58d3ef78e 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732004006
-SHA256 (postgresql/postgresql-16.6.tar.bz2) = 23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b
-SIZE (postgresql/postgresql-16.6.tar.bz2) = 24856956
+TIMESTAMP = 1739277664
+SHA256 (postgresql/postgresql-16.7.tar.bz2) = 62e02f77ebfc4a37f1700c20cc3ccd85ff797b5613766ebf949a7899bb2113fe
+SIZE (postgresql/postgresql-16.7.tar.bz2) = 24905167
diff --git a/databases/postgresql16-server/pkg-plist-contrib b/databases/postgresql16-server/pkg-plist-contrib
index 9010a8b464f3..c9cb5846e202 100644
--- a/databases/postgresql16-server/pkg-plist-contrib
+++ b/databases/postgresql16-server/pkg-plist-contrib
@@ -1,267 +1,268 @@
 bin/oid2name
 bin/vacuumlo
 include/postgresql/server/extension/cube/cubedata.h
 include/postgresql/server/extension/hstore/hstore.h
 include/postgresql/server/extension/isn/isn.h
 include/postgresql/server/extension/ltree/ltree.h
 include/postgresql/server/extension/seg/segdata.h
 lib/postgresql/_int.so
 lib/postgresql/adminpack.so
 lib/postgresql/amcheck.so
 lib/postgresql/auth_delay.so
 lib/postgresql/auto_explain.so
 lib/postgresql/autoinc.so
 lib/postgresql/basebackup_to_shell.so
 lib/postgresql/basic_archive.so
 lib/postgresql/bloom.so
 lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/citext.so
 lib/postgresql/cube.so
 lib/postgresql/dblink.so
 lib/postgresql/dict_int.so
 lib/postgresql/dict_xsyn.so
 lib/postgresql/earthdistance.so
 lib/postgresql/file_fdw.so
 lib/postgresql/fuzzystrmatch.so
 lib/postgresql/hstore.so
 lib/postgresql/insert_username.so
 lib/postgresql/isn.so
 lib/postgresql/lo.so
 lib/postgresql/ltree.so
 lib/postgresql/moddatetime.so
 lib/postgresql/old_snapshot.so
 lib/postgresql/pageinspect.so
 lib/postgresql/passwordcheck.so
 lib/postgresql/pg_buffercache.so
 lib/postgresql/pg_freespacemap.so
 lib/postgresql/pg_prewarm.so
 lib/postgresql/pg_stat_statements.so
 lib/postgresql/pg_surgery.so
 lib/postgresql/pg_trgm.so
 lib/postgresql/pg_visibility.so
 lib/postgresql/pg_walinspect.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgrowlocks.so
 lib/postgresql/pgstattuple.so
 %%XML%%lib/postgresql/pgxml.so
 lib/postgresql/postgres_fdw.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 %%OPENSSL%%lib/postgresql/sslinfo.so
 lib/postgresql/tablefunc.so
 lib/postgresql/tcn.so
 lib/postgresql/test_decoding.so
 lib/postgresql/tsm_system_rows.so
 lib/postgresql/tsm_system_time.so
 lib/postgresql/unaccent.so
 lib/postgresql/uuid-ossp.so
 %%PORTDOCS%%%%DOCSDIR%%/README-contrib
 %%PORTDOCS%%%%DOCSDIR%%/extension/README
 %%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
 %%DATADIR%%/extension/adminpack--1.0--1.1.sql
 %%DATADIR%%/extension/adminpack--1.0.sql
 %%DATADIR%%/extension/adminpack--1.1--2.0.sql
 %%DATADIR%%/extension/adminpack--2.0--2.1.sql
 %%DATADIR%%/extension/adminpack.control
 %%DATADIR%%/extension/amcheck--1.0--1.1.sql
 %%DATADIR%%/extension/amcheck--1.0.sql
 %%DATADIR%%/extension/amcheck--1.1--1.2.sql
 %%DATADIR%%/extension/amcheck--1.2--1.3.sql
 %%DATADIR%%/extension/amcheck.control
 %%DATADIR%%/extension/autoinc--1.0.sql
 %%DATADIR%%/extension/autoinc.control
 %%DATADIR%%/extension/bloom--1.0.sql
 %%DATADIR%%/extension/bloom.control
 %%DATADIR%%/extension/btree_gin--1.0--1.1.sql
 %%DATADIR%%/extension/btree_gin--1.0.sql
 %%DATADIR%%/extension/btree_gin--1.1--1.2.sql
 %%DATADIR%%/extension/btree_gin--1.2--1.3.sql
 %%DATADIR%%/extension/btree_gin.control
 %%DATADIR%%/extension/btree_gist--1.0--1.1.sql
 %%DATADIR%%/extension/btree_gist--1.1--1.2.sql
 %%DATADIR%%/extension/btree_gist--1.2--1.3.sql
 %%DATADIR%%/extension/btree_gist--1.2.sql
 %%DATADIR%%/extension/btree_gist--1.3--1.4.sql
 %%DATADIR%%/extension/btree_gist--1.4--1.5.sql
 %%DATADIR%%/extension/btree_gist--1.5--1.6.sql
 %%DATADIR%%/extension/btree_gist--1.6--1.7.sql
 %%DATADIR%%/extension/btree_gist.control
 %%DATADIR%%/extension/citext--1.0--1.1.sql
 %%DATADIR%%/extension/citext--1.1--1.2.sql
 %%DATADIR%%/extension/citext--1.2--1.3.sql
 %%DATADIR%%/extension/citext--1.3--1.4.sql
 %%DATADIR%%/extension/citext--1.4--1.5.sql
 %%DATADIR%%/extension/citext--1.4.sql
 %%DATADIR%%/extension/citext--1.5--1.6.sql
 %%DATADIR%%/extension/citext.control
 %%DATADIR%%/extension/cube--1.0--1.1.sql
 %%DATADIR%%/extension/cube--1.1--1.2.sql
 %%DATADIR%%/extension/cube--1.2--1.3.sql
 %%DATADIR%%/extension/cube--1.2.sql
 %%DATADIR%%/extension/cube--1.3--1.4.sql
 %%DATADIR%%/extension/cube--1.4--1.5.sql
 %%DATADIR%%/extension/cube.control
 %%DATADIR%%/extension/dblink--1.0--1.1.sql
 %%DATADIR%%/extension/dblink--1.1--1.2.sql
 %%DATADIR%%/extension/dblink--1.2.sql
 %%DATADIR%%/extension/dblink.control
 %%DATADIR%%/extension/dict_int--1.0.sql
 %%DATADIR%%/extension/dict_int.control
 %%DATADIR%%/extension/dict_xsyn--1.0.sql
 %%DATADIR%%/extension/dict_xsyn.control
 %%DATADIR%%/extension/earthdistance--1.0--1.1.sql
+%%DATADIR%%/extension/earthdistance--1.1--1.2.sql
 %%DATADIR%%/extension/earthdistance--1.1.sql
 %%DATADIR%%/extension/earthdistance.control
 %%DATADIR%%/extension/file_fdw--1.0.sql
 %%DATADIR%%/extension/file_fdw.control
 %%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
 %%DATADIR%%/extension/fuzzystrmatch--1.1--1.2.sql
 %%DATADIR%%/extension/fuzzystrmatch--1.1.sql
 %%DATADIR%%/extension/fuzzystrmatch.control
 %%DATADIR%%/extension/hstore--1.1--1.2.sql
 %%DATADIR%%/extension/hstore--1.2--1.3.sql
 %%DATADIR%%/extension/hstore--1.3--1.4.sql
 %%DATADIR%%/extension/hstore--1.4--1.5.sql
 %%DATADIR%%/extension/hstore--1.4.sql
 %%DATADIR%%/extension/hstore--1.5--1.6.sql
 %%DATADIR%%/extension/hstore--1.6--1.7.sql
 %%DATADIR%%/extension/hstore--1.7--1.8.sql
 %%DATADIR%%/extension/hstore.control
 %%DATADIR%%/extension/insert_username--1.0.sql
 %%DATADIR%%/extension/insert_username.control
 %%DATADIR%%/extension/intagg--1.0--1.1.sql
 %%DATADIR%%/extension/intagg--1.1.sql
 %%DATADIR%%/extension/intagg.control
 %%DATADIR%%/extension/intarray--1.0--1.1.sql
 %%DATADIR%%/extension/intarray--1.1--1.2.sql
 %%DATADIR%%/extension/intarray--1.2--1.3.sql
 %%DATADIR%%/extension/intarray--1.2.sql
 %%DATADIR%%/extension/intarray--1.3--1.4.sql
 %%DATADIR%%/extension/intarray--1.4--1.5.sql
 %%DATADIR%%/extension/intarray.control
 %%DATADIR%%/extension/isn--1.0--1.1.sql
 %%DATADIR%%/extension/isn--1.1--1.2.sql
 %%DATADIR%%/extension/isn--1.1.sql
 %%DATADIR%%/extension/isn.control
 %%DATADIR%%/extension/lo--1.0--1.1.sql
 %%DATADIR%%/extension/lo--1.1.sql
 %%DATADIR%%/extension/lo.control
 %%DATADIR%%/extension/ltree--1.0--1.1.sql
 %%DATADIR%%/extension/ltree--1.1--1.2.sql
 %%DATADIR%%/extension/ltree--1.1.sql
 %%DATADIR%%/extension/ltree.control
 %%DATADIR%%/extension/moddatetime--1.0.sql
 %%DATADIR%%/extension/moddatetime.control
 %%DATADIR%%/extension/old_snapshot--1.0.sql
 %%DATADIR%%/extension/old_snapshot.control
 %%DATADIR%%/extension/pageinspect--1.0--1.1.sql
 %%DATADIR%%/extension/pageinspect--1.1--1.2.sql
 %%DATADIR%%/extension/pageinspect--1.10--1.11.sql
 %%DATADIR%%/extension/pageinspect--1.11--1.12.sql
 %%DATADIR%%/extension/pageinspect--1.2--1.3.sql
 %%DATADIR%%/extension/pageinspect--1.3--1.4.sql
 %%DATADIR%%/extension/pageinspect--1.4--1.5.sql
 %%DATADIR%%/extension/pageinspect--1.5--1.6.sql
 %%DATADIR%%/extension/pageinspect--1.5.sql
 %%DATADIR%%/extension/pageinspect--1.6--1.7.sql
 %%DATADIR%%/extension/pageinspect--1.7--1.8.sql
 %%DATADIR%%/extension/pageinspect--1.8--1.9.sql
 %%DATADIR%%/extension/pageinspect--1.9--1.10.sql
 %%DATADIR%%/extension/pageinspect.control
 %%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
 %%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
 %%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
 %%DATADIR%%/extension/pg_buffercache--1.2.sql
 %%DATADIR%%/extension/pg_buffercache--1.3--1.4.sql
 %%DATADIR%%/extension/pg_buffercache.control
 %%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
 %%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
 %%DATADIR%%/extension/pg_freespacemap--1.1.sql
 %%DATADIR%%/extension/pg_freespacemap.control
 %%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
 %%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql
 %%DATADIR%%/extension/pg_prewarm--1.1.sql
 %%DATADIR%%/extension/pg_prewarm.control
 %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
 %%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
 %%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
 %%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
 %%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
 %%DATADIR%%/extension/pg_stat_statements--1.4.sql
 %%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
 %%DATADIR%%/extension/pg_stat_statements--1.6--1.7.sql
 %%DATADIR%%/extension/pg_stat_statements--1.7--1.8.sql
 %%DATADIR%%/extension/pg_stat_statements--1.8--1.9.sql
 %%DATADIR%%/extension/pg_stat_statements--1.9--1.10.sql
 %%DATADIR%%/extension/pg_stat_statements.control
 %%DATADIR%%/extension/pg_surgery--1.0.sql
 %%DATADIR%%/extension/pg_surgery.control
 %%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
 %%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
 %%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
 %%DATADIR%%/extension/pg_trgm--1.3--1.4.sql
 %%DATADIR%%/extension/pg_trgm--1.3.sql
 %%DATADIR%%/extension/pg_trgm--1.4--1.5.sql
 %%DATADIR%%/extension/pg_trgm--1.5--1.6.sql
 %%DATADIR%%/extension/pg_trgm.control
 %%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
 %%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
 %%DATADIR%%/extension/pg_visibility--1.1.sql
 %%DATADIR%%/extension/pg_visibility.control
 %%DATADIR%%/extension/pg_walinspect--1.0--1.1.sql
 %%DATADIR%%/extension/pg_walinspect--1.0.sql
 %%DATADIR%%/extension/pg_walinspect.control
 %%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
 %%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
 %%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
 %%DATADIR%%/extension/pgcrypto--1.3.sql
 %%DATADIR%%/extension/pgcrypto.control
 %%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
 %%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
 %%DATADIR%%/extension/pgrowlocks--1.2.sql
 %%DATADIR%%/extension/pgrowlocks.control
 %%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
 %%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
 %%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
 %%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
 %%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
 %%DATADIR%%/extension/pgstattuple--1.4.sql
 %%DATADIR%%/extension/pgstattuple.control
 %%DATADIR%%/extension/postgres_fdw--1.0--1.1.sql
 %%DATADIR%%/extension/postgres_fdw--1.0.sql
 %%DATADIR%%/extension/postgres_fdw.control
 %%DATADIR%%/extension/refint--1.0.sql
 %%DATADIR%%/extension/refint.control
 %%DATADIR%%/extension/seg--1.0--1.1.sql
 %%DATADIR%%/extension/seg--1.1--1.2.sql
 %%DATADIR%%/extension/seg--1.1.sql
 %%DATADIR%%/extension/seg--1.2--1.3.sql
 %%DATADIR%%/extension/seg--1.3--1.4.sql
 %%DATADIR%%/extension/seg.control
 %%DATADIR%%/extension/tablefunc--1.0.sql
 %%DATADIR%%/extension/tablefunc.control
 %%DATADIR%%/extension/tcn--1.0.sql
 %%DATADIR%%/extension/tcn.control
 %%DATADIR%%/extension/tsm_system_rows--1.0.sql
 %%DATADIR%%/extension/tsm_system_rows.control
 %%DATADIR%%/extension/tsm_system_time--1.0.sql
 %%DATADIR%%/extension/tsm_system_time.control
 %%DATADIR%%/extension/unaccent--1.0--1.1.sql
 %%DATADIR%%/extension/unaccent--1.1.sql
 %%DATADIR%%/extension/unaccent.control
 %%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
 %%DATADIR%%/extension/uuid-ossp--1.1.sql
 %%DATADIR%%/extension/uuid-ossp.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
 %%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
 %%XML%%%%DATADIR%%/extension/xml2--1.1.sql
 %%XML%%%%DATADIR%%/extension/xml2.control
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index 20c681c36b09..52e6f130b2be 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,278 +1,245 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	17.2
+DISTVERSION?=	17.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}
 #DISTFILES+=	${PORTNAME}-${DISTVERSION}-docs.tar.bz:docs
 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+=		bison perl5 tar:bzip2 cpe
 USE_PERL5=	build
 .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_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
 
 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
 
 .  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
 .  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:min=11,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
-KRB5_DESC=		Build with kerberos provider support
 NLS_DESC=		Use internationalized messages
 PAM_DESC=		Build with PAM Support
-MIT_KRB5_DESC=		Build with MIT kerberos support
-HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
-GSSAPI_DESC=		Build with GSSAPI 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
 
 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
 
-.if !defined(SLAVE_ONLY)
-
-PATCH_DIST_STRIP=-p1
-
-.if ${PORT_OPTIONS:MGSSAPI}
-.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
-# Kerberos libraries will pull the proper GSSAPI library
-# via linker dependencies, but otherwise we must specify
-# it explicitely: ld --as-needed is used for compilation,
-# so configure's -lgssapi_krb5 won't go.
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-.endif
-.endif
-
-.  if ${PORT_OPTIONS:MMIT_KRB5}
-.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
-IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
-.   else
-CONFIGURE_ARGS+=--with-krb5
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so.3:security/krb5
-.    endif
-.   endif
-.  endif
-
-.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
-CONFIGURE_ARGS+=--with-krb5
-.  endif
-
-.endif # !SLAVE_ONLY
-
 # 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)
 	@ cd ${WRKSRC}/doc && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} man
 .  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)
 	@ ${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)
 	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 	@ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
 .  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/postgresql17-server/distinfo b/databases/postgresql17-server/distinfo
index 0c89d35fe33b..9487a5b669c8 100644
--- a/databases/postgresql17-server/distinfo
+++ b/databases/postgresql17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732004007
-SHA256 (postgresql/postgresql-17.2.tar.bz2) = 82ef27c0af3751695d7f64e2d963583005fbb6a0c3df63d0e4b42211d7021164
-SIZE (postgresql/postgresql-17.2.tar.bz2) = 21408880
+TIMESTAMP = 1739277665
+SHA256 (postgresql/postgresql-17.3.tar.bz2) = 13c18b35bf67a97bd639925fc581db7fd2aae4d3548eac39fcdb8da74ace2bea
+SIZE (postgresql/postgresql-17.3.tar.bz2) = 21520115
diff --git a/databases/postgresql17-server/pkg-plist-contrib b/databases/postgresql17-server/pkg-plist-contrib
index 392ccfd8e912..d78987043402 100644
--- a/databases/postgresql17-server/pkg-plist-contrib
+++ b/databases/postgresql17-server/pkg-plist-contrib
@@ -1,262 +1,263 @@
 bin/oid2name
 bin/vacuumlo
 include/postgresql/server/extension/cube/cubedata.h
 include/postgresql/server/extension/hstore/hstore.h
 include/postgresql/server/extension/isn/isn.h
 include/postgresql/server/extension/ltree/ltree.h
 include/postgresql/server/extension/seg/segdata.h
 lib/postgresql/_int.so
 lib/postgresql/amcheck.so
 lib/postgresql/auth_delay.so
 lib/postgresql/auto_explain.so
 lib/postgresql/autoinc.so
 lib/postgresql/basebackup_to_shell.so
 lib/postgresql/basic_archive.so
 lib/postgresql/bloom.so
 lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/citext.so
 lib/postgresql/cube.so
 lib/postgresql/dblink.so
 lib/postgresql/dict_int.so
 lib/postgresql/dict_xsyn.so
 lib/postgresql/earthdistance.so
 lib/postgresql/file_fdw.so
 lib/postgresql/fuzzystrmatch.so
 lib/postgresql/hstore.so
 lib/postgresql/insert_username.so
 lib/postgresql/isn.so
 lib/postgresql/lo.so
 lib/postgresql/ltree.so
 lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.so
 lib/postgresql/passwordcheck.so
 lib/postgresql/pg_buffercache.so
 lib/postgresql/pg_freespacemap.so
 lib/postgresql/pg_prewarm.so
 lib/postgresql/pg_stat_statements.so
 lib/postgresql/pg_surgery.so
 lib/postgresql/pg_trgm.so
 lib/postgresql/pg_visibility.so
 lib/postgresql/pg_walinspect.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgrowlocks.so
 lib/postgresql/pgstattuple.so
 %%XML%%lib/postgresql/pgxml.so
 lib/postgresql/postgres_fdw.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 %%OPENSSL%%lib/postgresql/sslinfo.so
 lib/postgresql/tablefunc.so
 lib/postgresql/tcn.so
 lib/postgresql/test_decoding.so
 lib/postgresql/tsm_system_rows.so
 lib/postgresql/tsm_system_time.so
 lib/postgresql/unaccent.so
 lib/postgresql/uuid-ossp.so
 %%PORTDOCS%%%%DOCSDIR%%/README-contrib
 %%PORTDOCS%%%%DOCSDIR%%/extension/README
 %%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
 %%DATADIR%%/extension/amcheck--1.0--1.1.sql
 %%DATADIR%%/extension/amcheck--1.0.sql
 %%DATADIR%%/extension/amcheck--1.1--1.2.sql
 %%DATADIR%%/extension/amcheck--1.2--1.3.sql
 %%DATADIR%%/extension/amcheck--1.3--1.4.sql
 %%DATADIR%%/extension/amcheck.control
 %%DATADIR%%/extension/autoinc--1.0.sql
 %%DATADIR%%/extension/autoinc.control
 %%DATADIR%%/extension/bloom--1.0.sql
 %%DATADIR%%/extension/bloom.control
 %%DATADIR%%/extension/btree_gin--1.0--1.1.sql
 %%DATADIR%%/extension/btree_gin--1.0.sql
 %%DATADIR%%/extension/btree_gin--1.1--1.2.sql
 %%DATADIR%%/extension/btree_gin--1.2--1.3.sql
 %%DATADIR%%/extension/btree_gin.control
 %%DATADIR%%/extension/btree_gist--1.0--1.1.sql
 %%DATADIR%%/extension/btree_gist--1.1--1.2.sql
 %%DATADIR%%/extension/btree_gist--1.2--1.3.sql
 %%DATADIR%%/extension/btree_gist--1.2.sql
 %%DATADIR%%/extension/btree_gist--1.3--1.4.sql
 %%DATADIR%%/extension/btree_gist--1.4--1.5.sql
 %%DATADIR%%/extension/btree_gist--1.5--1.6.sql
 %%DATADIR%%/extension/btree_gist--1.6--1.7.sql
 %%DATADIR%%/extension/btree_gist.control
 %%DATADIR%%/extension/citext--1.0--1.1.sql
 %%DATADIR%%/extension/citext--1.1--1.2.sql
 %%DATADIR%%/extension/citext--1.2--1.3.sql
 %%DATADIR%%/extension/citext--1.3--1.4.sql
 %%DATADIR%%/extension/citext--1.4--1.5.sql
 %%DATADIR%%/extension/citext--1.4.sql
 %%DATADIR%%/extension/citext--1.5--1.6.sql
 %%DATADIR%%/extension/citext.control
 %%DATADIR%%/extension/cube--1.0--1.1.sql
 %%DATADIR%%/extension/cube--1.1--1.2.sql
 %%DATADIR%%/extension/cube--1.2--1.3.sql
 %%DATADIR%%/extension/cube--1.2.sql
 %%DATADIR%%/extension/cube--1.3--1.4.sql
 %%DATADIR%%/extension/cube--1.4--1.5.sql
 %%DATADIR%%/extension/cube.control
 %%DATADIR%%/extension/dblink--1.0--1.1.sql
 %%DATADIR%%/extension/dblink--1.1--1.2.sql
 %%DATADIR%%/extension/dblink--1.2.sql
 %%DATADIR%%/extension/dblink.control
 %%DATADIR%%/extension/dict_int--1.0.sql
 %%DATADIR%%/extension/dict_int.control
 %%DATADIR%%/extension/dict_xsyn--1.0.sql
 %%DATADIR%%/extension/dict_xsyn.control
 %%DATADIR%%/extension/earthdistance--1.0--1.1.sql
+%%DATADIR%%/extension/earthdistance--1.1--1.2.sql
 %%DATADIR%%/extension/earthdistance--1.1.sql
 %%DATADIR%%/extension/earthdistance.control
 %%DATADIR%%/extension/file_fdw--1.0.sql
 %%DATADIR%%/extension/file_fdw.control
 %%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
 %%DATADIR%%/extension/fuzzystrmatch--1.1--1.2.sql
 %%DATADIR%%/extension/fuzzystrmatch--1.1.sql
 %%DATADIR%%/extension/fuzzystrmatch.control
 %%DATADIR%%/extension/hstore--1.1--1.2.sql
 %%DATADIR%%/extension/hstore--1.2--1.3.sql
 %%DATADIR%%/extension/hstore--1.3--1.4.sql
 %%DATADIR%%/extension/hstore--1.4--1.5.sql
 %%DATADIR%%/extension/hstore--1.4.sql
 %%DATADIR%%/extension/hstore--1.5--1.6.sql
 %%DATADIR%%/extension/hstore--1.6--1.7.sql
 %%DATADIR%%/extension/hstore--1.7--1.8.sql
 %%DATADIR%%/extension/hstore.control
 %%DATADIR%%/extension/insert_username--1.0.sql
 %%DATADIR%%/extension/insert_username.control
 %%DATADIR%%/extension/intagg--1.0--1.1.sql
 %%DATADIR%%/extension/intagg--1.1.sql
 %%DATADIR%%/extension/intagg.control
 %%DATADIR%%/extension/intarray--1.0--1.1.sql
 %%DATADIR%%/extension/intarray--1.1--1.2.sql
 %%DATADIR%%/extension/intarray--1.2--1.3.sql
 %%DATADIR%%/extension/intarray--1.2.sql
 %%DATADIR%%/extension/intarray--1.3--1.4.sql
 %%DATADIR%%/extension/intarray--1.4--1.5.sql
 %%DATADIR%%/extension/intarray.control
 %%DATADIR%%/extension/isn--1.0--1.1.sql
 %%DATADIR%%/extension/isn--1.1--1.2.sql
 %%DATADIR%%/extension/isn--1.1.sql
 %%DATADIR%%/extension/isn.control
 %%DATADIR%%/extension/lo--1.0--1.1.sql
 %%DATADIR%%/extension/lo--1.1.sql
 %%DATADIR%%/extension/lo.control
 %%DATADIR%%/extension/ltree--1.0--1.1.sql
 %%DATADIR%%/extension/ltree--1.1--1.2.sql
 %%DATADIR%%/extension/ltree--1.1.sql
 %%DATADIR%%/extension/ltree--1.2--1.3.sql
 %%DATADIR%%/extension/ltree.control
 %%DATADIR%%/extension/moddatetime--1.0.sql
 %%DATADIR%%/extension/moddatetime.control
 %%DATADIR%%/extension/pageinspect--1.0--1.1.sql
 %%DATADIR%%/extension/pageinspect--1.1--1.2.sql
 %%DATADIR%%/extension/pageinspect--1.10--1.11.sql
 %%DATADIR%%/extension/pageinspect--1.11--1.12.sql
 %%DATADIR%%/extension/pageinspect--1.2--1.3.sql
 %%DATADIR%%/extension/pageinspect--1.3--1.4.sql
 %%DATADIR%%/extension/pageinspect--1.4--1.5.sql
 %%DATADIR%%/extension/pageinspect--1.5--1.6.sql
 %%DATADIR%%/extension/pageinspect--1.5.sql
 %%DATADIR%%/extension/pageinspect--1.6--1.7.sql
 %%DATADIR%%/extension/pageinspect--1.7--1.8.sql
 %%DATADIR%%/extension/pageinspect--1.8--1.9.sql
 %%DATADIR%%/extension/pageinspect--1.9--1.10.sql
 %%DATADIR%%/extension/pageinspect.control
 %%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
 %%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
 %%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
 %%DATADIR%%/extension/pg_buffercache--1.2.sql
 %%DATADIR%%/extension/pg_buffercache--1.3--1.4.sql
 %%DATADIR%%/extension/pg_buffercache--1.4--1.5.sql
 %%DATADIR%%/extension/pg_buffercache.control
 %%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
 %%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
 %%DATADIR%%/extension/pg_freespacemap--1.1.sql
 %%DATADIR%%/extension/pg_freespacemap.control
 %%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
 %%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql
 %%DATADIR%%/extension/pg_prewarm--1.1.sql
 %%DATADIR%%/extension/pg_prewarm.control
 %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
 %%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
 %%DATADIR%%/extension/pg_stat_statements--1.10--1.11.sql
 %%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
 %%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
 %%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
 %%DATADIR%%/extension/pg_stat_statements--1.4.sql
 %%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
 %%DATADIR%%/extension/pg_stat_statements--1.6--1.7.sql
 %%DATADIR%%/extension/pg_stat_statements--1.7--1.8.sql
 %%DATADIR%%/extension/pg_stat_statements--1.8--1.9.sql
 %%DATADIR%%/extension/pg_stat_statements--1.9--1.10.sql
 %%DATADIR%%/extension/pg_stat_statements.control
 %%DATADIR%%/extension/pg_surgery--1.0.sql
 %%DATADIR%%/extension/pg_surgery.control
 %%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
 %%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
 %%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
 %%DATADIR%%/extension/pg_trgm--1.3--1.4.sql
 %%DATADIR%%/extension/pg_trgm--1.3.sql
 %%DATADIR%%/extension/pg_trgm--1.4--1.5.sql
 %%DATADIR%%/extension/pg_trgm--1.5--1.6.sql
 %%DATADIR%%/extension/pg_trgm.control
 %%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
 %%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
 %%DATADIR%%/extension/pg_visibility--1.1.sql
 %%DATADIR%%/extension/pg_visibility.control
 %%DATADIR%%/extension/pg_walinspect--1.0--1.1.sql
 %%DATADIR%%/extension/pg_walinspect--1.0.sql
 %%DATADIR%%/extension/pg_walinspect.control
 %%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
 %%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
 %%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
 %%DATADIR%%/extension/pgcrypto--1.3.sql
 %%DATADIR%%/extension/pgcrypto.control
 %%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
 %%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
 %%DATADIR%%/extension/pgrowlocks--1.2.sql
 %%DATADIR%%/extension/pgrowlocks.control
 %%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
 %%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
 %%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
 %%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
 %%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
 %%DATADIR%%/extension/pgstattuple--1.4.sql
 %%DATADIR%%/extension/pgstattuple.control
 %%DATADIR%%/extension/postgres_fdw--1.0--1.1.sql
 %%DATADIR%%/extension/postgres_fdw--1.0.sql
 %%DATADIR%%/extension/postgres_fdw.control
 %%DATADIR%%/extension/refint--1.0.sql
 %%DATADIR%%/extension/refint.control
 %%DATADIR%%/extension/seg--1.0--1.1.sql
 %%DATADIR%%/extension/seg--1.1--1.2.sql
 %%DATADIR%%/extension/seg--1.1.sql
 %%DATADIR%%/extension/seg--1.2--1.3.sql
 %%DATADIR%%/extension/seg--1.3--1.4.sql
 %%DATADIR%%/extension/seg.control
 %%DATADIR%%/extension/tablefunc--1.0.sql
 %%DATADIR%%/extension/tablefunc.control
 %%DATADIR%%/extension/tcn--1.0.sql
 %%DATADIR%%/extension/tcn.control
 %%DATADIR%%/extension/tsm_system_rows--1.0.sql
 %%DATADIR%%/extension/tsm_system_rows.control
 %%DATADIR%%/extension/tsm_system_time--1.0.sql
 %%DATADIR%%/extension/tsm_system_time.control
 %%DATADIR%%/extension/unaccent--1.0--1.1.sql
 %%DATADIR%%/extension/unaccent--1.1.sql
 %%DATADIR%%/extension/unaccent.control
 %%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
 %%DATADIR%%/extension/uuid-ossp--1.1.sql
 %%DATADIR%%/extension/uuid-ossp.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
 %%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
 %%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
 %%XML%%%%DATADIR%%/extension/xml2--1.1.sql
 %%XML%%%%DATADIR%%/extension/xml2.control