diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 58c612dc589e..32158b898ac3 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -1,26 +1,26 @@
-DISTVERSION?=	11.20
+DISTVERSION?=	11.21
 # 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
 
 DEPRECATED=	PostgreSQL-11 will reach end-of-life on 2023-11-09
 EXPIRATION_DATE=2023-12-31
 
 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_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_basebackup src/bin/pg_archivecleanup \
 		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/postgresql11-server/distinfo b/databases/postgresql11-server/distinfo
index cfa9c2b2178c..6a45ebd2846c 100644
--- a/databases/postgresql11-server/distinfo
+++ b/databases/postgresql11-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683631074
-SHA256 (postgresql/postgresql-11.20.tar.bz2) = 3d7c8882f64a7e98534a044257dfee7abad77a5b7da12508d85d722b98b5acce
-SIZE (postgresql/postgresql-11.20.tar.bz2) = 20456483
+TIMESTAMP = 1691487688
+SHA256 (postgresql/postgresql-11.21.tar.bz2) = 07b0837471d5dd77b25166b34718f3ba10816b6ad61e691e6fc547cf3fcff850
+SIZE (postgresql/postgresql-11.21.tar.bz2) = 20467892
diff --git a/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 9cb76e880f73..3d297bbc819d 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	12.15
+DISTVERSION?=	12.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/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index 9b52869a1c86..5d927a821ba8 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683631075
-SHA256 (postgresql/postgresql-12.15.tar.bz2) = bb5206e2864c1c4579938b96ea6096d155f22abf2d2cc2aa57571e3c4cb12b36
-SIZE (postgresql/postgresql-12.15.tar.bz2) = 21127306
+TIMESTAMP = 1691487695
+SHA256 (postgresql/postgresql-12.16.tar.bz2) = c5f1fff7a0f93e1ec3746417b0594290ece617b4995ed95b8d527af0ba0e38f3
+SIZE (postgresql/postgresql-12.16.tar.bz2) = 21140532
diff --git a/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index e23f70b4a118..7e7077c5454b 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	13.11
+DISTVERSION?=	13.12
 # 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 d62375c0a985..6891e3a57315 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683631076
-SHA256 (postgresql/postgresql-13.11.tar.bz2) = 4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
-SIZE (postgresql/postgresql-13.11.tar.bz2) = 21519655
+TIMESTAMP = 1691487702
+SHA256 (postgresql/postgresql-13.12.tar.bz2) = 0da1edcee3514b7bc7ba6dbaf0c00499e8ac1590668e8789c50253a6249f218b
+SIZE (postgresql/postgresql-13.12.tar.bz2) = 21542293
diff --git a/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 32e9c386dbd5..1391498a64f5 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	14.8
+DISTVERSION?=	14.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_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 adf611d66417..5bf844b979ae 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683631077
-SHA256 (postgresql/postgresql-14.8.tar.bz2) = 39d38f0030737ed03835debeefee3b37d335462ce4995e2497bc38d621ebe45a
-SIZE (postgresql/postgresql-14.8.tar.bz2) = 22204905
+TIMESTAMP = 1691487709
+SHA256 (postgresql/postgresql-14.9.tar.bz2) = b1fe3ba9b1a7f3a9637dd1656dfdad2889016073fd4d35f13b50143cbbb6a8ef
+SIZE (postgresql/postgresql-14.9.tar.bz2) = 22207374
diff --git a/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index 6dd6bcc49cb0..923aab8c9a02 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,24 +1,24 @@
-DISTVERSION?=	15.3
+DISTVERSION?=	15.4
 # 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 96b03c9c614f..ba300024aefc 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683631078
-SHA256 (postgresql/postgresql-15.3.tar.bz2) = ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932
-SIZE (postgresql/postgresql-15.3.tar.bz2) = 22819107
+TIMESTAMP = 1691487716
+SHA256 (postgresql/postgresql-15.4.tar.bz2) = baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9
+SIZE (postgresql/postgresql-15.4.tar.bz2) = 22850355
diff --git a/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 3636ac7a04e8..3123cd927e9a 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,296 +1,296 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	16beta2
+DISTVERSION?=	16beta3
 # 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
 .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
 
 OPTIONS_SUB=	yes
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
 .else
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 .endif
 
 .if defined(SERVER_ONLY)
 OPTIONS_DEFINE=	DTRACE LDAP INTDATE TZDATA XML DOCS
 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
 OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_12=	LLVM
 LLVM_CONFIGURE_WITH=	llvm
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
 			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
 LLVM_USES=		llvm:max=15,min=11,lib
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS_DEFINE+=	INTDATE
 INTDATE_DESC=		Builds with 64-bit date/time type
 OPTIONS_DEFAULT+=	INTDATE
 
 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
 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
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 
 OPTIONS_DEFINE+=	SSL
 SSL_DESC=		Build with OpenSSL support
 
 OPTIONS_DEFAULT+=	SSL
 
 GSSAPI_CONFIGURE_WITH=	gssapi
 .endif # !SLAVE_ONLY
 
 .if defined(CLIENT_ONLY)
 LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
 LIBEDIT_USES=		libedit
 LIBEDIT_USES_OFF=	readline
 .endif # CLIENT_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
 
 INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
 
 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 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${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} && \
 		${SETENV} ${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 && ${SETENV} ${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 c5ee696409b9..78a17c56409c 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688468148
-SHA256 (postgresql/postgresql-16beta2.tar.bz2) = ba653197465180c93775b4949a89dc6fbfebae2a44587ae7168fdfd24f519b50
-SIZE (postgresql/postgresql-16beta2.tar.bz2) = 24300580
+TIMESTAMP = 1691487723
+SHA256 (postgresql/postgresql-16beta3.tar.bz2) = ffcf44e272662f6ac451a8d6d6ff951715db651c8d4907ec659cbde46abd52d3
+SIZE (postgresql/postgresql-16beta3.tar.bz2) = 24313365
diff --git a/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -1,21 +1,10 @@
 --- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
 +++ src/backend/utils/misc/postgresql.conf.sample
 @@ -330,6 +330,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------