diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 6256f9d500b8..2598de59a610 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	12.20
+DISTVERSION?=	12.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
diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index 6611b9e57b17..6f77643ba84c 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722892656
-SHA256 (postgresql/postgresql-12.20.tar.bz2) = 2d543af3009fec7fd5af35f7a70c95085d3eef6b508e517aa9493e99b15e9ea9
-SIZE (postgresql/postgresql-12.20.tar.bz2) = 21256573
+TIMESTAMP = 1731416618
+SHA256 (postgresql/postgresql-12.21.tar.bz2) = 6c711550ac1cc7828865e5823d9f457e3bdad6f4320177169f90e419be0c27f2
+SIZE (postgresql/postgresql-12.21.tar.bz2) = 21298608
diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client
index 6c22268d8ee7..580d560f7dc7 100644
--- a/databases/postgresql12-server/pkg-plist-client
+++ b/databases/postgresql12-server/pkg-plist-client
@@ -393,8 +393,10 @@ include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 844eac64f852..5f5cada36ce4 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	13.16
+DISTVERSION?=	13.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
diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo
index 7bffa271dab4..481f3dda1fde 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722892657
-SHA256 (postgresql/postgresql-13.16.tar.bz2) = c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865
-SIZE (postgresql/postgresql-13.16.tar.bz2) = 21639411
+TIMESTAMP = 1731416619
+SHA256 (postgresql/postgresql-13.17.tar.bz2) = 022b0a6e7bc374a777eece33708895d7b60cae07d492b286b296a49d7395d78b
+SIZE (postgresql/postgresql-13.17.tar.bz2) = 21681613
diff --git a/databases/postgresql13-server/pkg-plist-client b/databases/postgresql13-server/pkg-plist-client
index 7b9715f1833d..df4b84846210 100644
--- a/databases/postgresql13-server/pkg-plist-client
+++ b/databases/postgresql13-server/pkg-plist-client
@@ -407,8 +407,10 @@ include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h
@@ -564,6 +566,7 @@ include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
 include/postgresql/server/port/win32_port.h
+include/postgresql/server/port/win32ntdll.h
 include/postgresql/server/portability/instr_time.h
 include/postgresql/server/portability/mem.h
 include/postgresql/server/postgres.h
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 1c4bfcbf70fe..619b97ccd68b 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	14.13
+DISTVERSION?=	14.14
 # 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
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index 1b18f55021c2..575ca7057636 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722892658
-SHA256 (postgresql/postgresql-14.13.tar.bz2) = 59aa3c4b495ab26a9ec69f3ad0a0228c51f0fe6facf3634dfad4d1197d613a56
-SIZE (postgresql/postgresql-14.13.tar.bz2) = 22414381
+TIMESTAMP = 1731416577
+SHA256 (postgresql/postgresql-14.14.tar.bz2) = 84727fbccdbd1efe01d8de64bc1b33095db773ad2457cefcedc2d8258ebc09d6
+SIZE (postgresql/postgresql-14.14.tar.bz2) = 22451431
diff --git a/databases/postgresql14-server/pkg-plist-client b/databases/postgresql14-server/pkg-plist-client
index e1558ef88990..e74d85fe4dec 100644
--- a/databases/postgresql14-server/pkg-plist-client
+++ b/databases/postgresql14-server/pkg-plist-client
@@ -422,8 +422,10 @@ include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h
@@ -583,6 +585,7 @@ include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
 include/postgresql/server/port/win32_port.h
+include/postgresql/server/port/win32ntdll.h
 include/postgresql/server/portability/instr_time.h
 include/postgresql/server/portability/mem.h
 include/postgresql/server/postgres.h
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index ac4c753660f0..bfec45b16b3d 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	15.8
+DISTVERSION?=	15.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
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
index cad7dae9f7de..2b65d6b36119 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722892659
-SHA256 (postgresql/postgresql-15.8.tar.bz2) = 4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a
-SIZE (postgresql/postgresql-15.8.tar.bz2) = 23119460
+TIMESTAMP = 1731416621
+SHA256 (postgresql/postgresql-15.9.tar.bz2) = 74f2d4565035f0cf729ecb059949faaf1102cbd93759b359822f98f82198c783
+SIZE (postgresql/postgresql-15.9.tar.bz2) = 23135232
diff --git a/databases/postgresql15-server/pkg-plist-client b/databases/postgresql15-server/pkg-plist-client
index a3a38a2a994e..93996c66c021 100644
--- a/databases/postgresql15-server/pkg-plist-client
+++ b/databases/postgresql15-server/pkg-plist-client
@@ -433,8 +433,10 @@ include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 13bf3276257e..9e5f4590cf33 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	16.4
+DISTVERSION?=	16.5
 # 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
@@ -70,13 +70,12 @@ GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
-OPTIONS_SUB=	yes
-
 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
@@ -118,7 +117,7 @@ CONFIGURE_ARGS+=	--without-icu
 
 
 .if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
+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
@@ -126,8 +125,6 @@ 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
diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
index 04974993010a..5e5c9bc124aa 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722892660
-SHA256 (postgresql/postgresql-16.4.tar.bz2) = 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f
-SIZE (postgresql/postgresql-16.4.tar.bz2) = 24765786
+TIMESTAMP = 1731416622
+SHA256 (postgresql/postgresql-16.5.tar.bz2) = a6cbbb7037f98cb8afa7d3970b7c48040cf02b115e39253a0c037a8bb8e778f0
+SIZE (postgresql/postgresql-16.5.tar.bz2) = 24854528
diff --git a/databases/postgresql16-server/pkg-plist-client b/databases/postgresql16-server/pkg-plist-client
index 0ece905e787c..776d3a865d25 100644
--- a/databases/postgresql16-server/pkg-plist-client
+++ b/databases/postgresql16-server/pkg-plist-client
@@ -436,8 +436,10 @@ include/postgresql/server/foreign/fdwapi.h
 include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index db1336803d0e..4715b4195fdf 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	17.0
+DISTVERSION?=	17.1
 # 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
@@ -72,25 +72,12 @@ 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
-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
-.else
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-.endif
 
 .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
@@ -132,7 +119,7 @@ CONFIGURE_ARGS+=	--without-icu
 
 
 .if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
+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
@@ -140,8 +127,6 @@ 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
diff --git a/databases/postgresql17-server/distinfo b/databases/postgresql17-server/distinfo
index 6dc68cb2cd95..2fcd5cc066d3 100644
--- a/databases/postgresql17-server/distinfo
+++ b/databases/postgresql17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727188382
-SHA256 (postgresql/postgresql-17.0.tar.bz2) = 7e276131c0fdd6b62588dbad9b3bb24b8c3498d5009328dba59af16e819109de
-SIZE (postgresql/postgresql-17.0.tar.bz2) = 21419388
+TIMESTAMP = 1731416623
+SHA256 (postgresql/postgresql-17.1.tar.bz2) = 7849db74ef6a8555d0723f87e81539301422fa9c8e9f21cce61fdc14e9199dcd
+SIZE (postgresql/postgresql-17.1.tar.bz2) = 21410991
diff --git a/databases/postgresql17-server/pkg-plist-client b/databases/postgresql17-server/pkg-plist-client
index fdf2e6386e4d..08fd1286023c 100644
--- a/databases/postgresql17-server/pkg-plist-client
+++ b/databases/postgresql17-server/pkg-plist-client
@@ -449,8 +449,10 @@ include/postgresql/server/foreign/fdwapi.h
 include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/SectionMemoryManager.h
 include/postgresql/server/jit/jit.h
 include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_backport.h
 include/postgresql/server/jit/llvmjit_emit.h
 include/postgresql/server/lib/binaryheap.h
 include/postgresql/server/lib/bipartite_match.h