postgresql: updated to 14.5, 13.8, 12.12, 11.17, 10.22

This update fixes over 40 bugs that were reported in the last several months. The issues listed below affect PostgreSQL 14. Some of these issues may also affect other supported versions of PostgreSQL.

Included in this release:

Fix replay of CREATE DATABASE write-ahead log (WAL) records on standby servers when encountering a missing tablespace directory.
Add support for tablespaces that are plain directories instead of symbolic links to other directories.
Fix permission checks in CREATE INDEX to use the user's permissions. This fixes broken dump/restore scenarios that relied on the behavior prior to the fix for CVE-2022-1552.
In the extended query protocol, force an immediate commit after CREATE DATABASE and other commands that can't run in a transaction block.
Fix a race condition around checking transaction visibility that was more likely to happen when using synchronous replication.
Fix incorrect permission-checking code for extended statistics.
Fix extended statistics machinery to handle most common value (MCV)-type statistics on boolean-valued expressions.
Avoid planner core dump with constant = ANY(array) clauses when there are MCV-type extended statistics on the array variable.
Allow cancellation of ANALYZE while it is computing extended statistics.
Fix ALTER TABLE ... ENABLE/DISABLE TRIGGER to handle recursion for triggers on partitioned tables.
Reject ROW() expressions and functions in FROM that have more than 1600 columns.
Fix memory leak in logical replication subscribers.
Fix checks in logical replication of replica identity when the target table is partitioned.
Arrange to clean up after commit-time errors within SPI_commit(), rather than expecting callers to do that. This includes a fix for the same scenario in PL/Python, which had reported crashes on Python 3.11 and memory leaks on older versions of Python 3.
Improve handling in libpq of idle states in pipeline mode.
In the psql \watch command, echo a newline after cancellation with control-C.
Fix pg_upgrade to detect non-upgradable usages of functions accepting anyarray parameters.
Several postgres_fdw fixes, including prevention of batch insertions when there are WITH CHECK OPTION constraints present.

58 files changed, 88 insertions, 135 deletions

diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile
index b02da7e2c12..478c2741fb5 100644
--- a/databases/postgresql10-client/Makefile
+++ b/databases/postgresql10-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2022/08/15 20:59:35 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
index af7e089f7e6..dcbcc82c538 100644
--- a/databases/postgresql10-contrib/Makefile
+++ b/databases/postgresql10-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2022/06/28 11:31:32 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-docs/Makefile b/databases/postgresql10-docs/Makefile
index 5d358bd1d4c..4c5708f1654 100644
--- a/databases/postgresql10-docs/Makefile
+++ b/databases/postgresql10-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2022/06/28 11:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST
index 8f136b74c95..c98524d23f3 100644
--- a/databases/postgresql10-docs/PLIST
+++ b/databases/postgresql10-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/05/12 19:02:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/08/15 20:59:36 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -931,6 +931,7 @@ share/doc/postgresql/html/release-10-19.html
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-20.html
 share/doc/postgresql/html/release-10-21.html
+share/doc/postgresql/html/release-10-22.html
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html
 share/doc/postgresql/html/release-10-5.html
diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile
index 0293391002f..eaf601dacd1 100644
--- a/databases/postgresql10-plperl/Makefile
+++ b/databases/postgresql10-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.21 2022/06/28 11:31:33 wiz Exp $
+#$ $NetBSD: Makefile,v 1.22 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile
index e8813bcae6c..373ae61e399 100644
--- a/databases/postgresql10-plpython/Makefile
+++ b/databases/postgresql10-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2022/06/30 11:18:09 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-pltcl/Makefile b/databases/postgresql10-pltcl/Makefile
index 9c747410a11..bda3b4e3a60 100644
--- a/databases/postgresql10-pltcl/Makefile
+++ b/databases/postgresql10-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2022/06/28 11:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index b907ecb4ff2..d8a5cf0c4e9 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2022/06/28 11:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql10/Makefile b/databases/postgresql10/Makefile
index 9ef95d357fb..be49bc7c2c8 100644
--- a/databases/postgresql10/Makefile
+++ b/databases/postgresql10/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2022/06/28 11:31:32 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/08/15 20:59:35 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql10-client>=${PKGVERSION_NOREV}:../../databases/postgresql10-client
diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common
index 79d6c6bbdcb..436e501c39a 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2022/05/21 07:25:34 nia Exp $
+# $NetBSD: Makefile.common,v 1.35 2022/08/15 20:59:35 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql10-pltcl/Makefile
 # used by databases/postgresql10-server/Makefile
 
-DISTNAME=	postgresql-10.21
+DISTNAME=	postgresql-10.22
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,9 +88,6 @@ CONFIGURE_ENV+=		pgac_cv_prog_cc_ldflags__Wl___as_needed=no
 # https://www.postgresql.org/message-id/E1X0yaj-000753-N6%40gemulon.postgresql.org
 BROKEN_ON_PLATFORM+=	*-*-alpha
 
-# "fatal error: catalog/pg_type_d.h: No such file or directory"
-MAKE_JOBS_SAFE=		no
-
 .if ${MACHINE_ARCH} == "sparc"
 CFLAGS.NetBSD+=		-D__sparc_v8__
 .endif
diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo
index e6dc54eecc3..66acf612682 100644
--- a/databases/postgresql10/distinfo
+++ b/databases/postgresql10/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2022/05/12 19:02:42 adam Exp $
+$NetBSD: distinfo,v 1.28 2022/08/15 20:59:35 adam Exp $
 
-BLAKE2s (postgresql-10.21.tar.bz2) = ed1e2be52212a5b0f5e4b657421a3b9618227c3f049b8f80da8c948f77b9b169
-SHA512 (postgresql-10.21.tar.bz2) = 1053e15505c0448df491119c9aad1617889b66118628a2155e3ec87e6648b2071a0a54e10d8fbbe00161b2aa86d1a6194d932a8cf5808c626e7972d135bb05c5
-Size (postgresql-10.21.tar.bz2) = 19409454 bytes
+BLAKE2s (postgresql-10.22.tar.bz2) = 05e3691e0952c0b921ad07d23ed3b6c84829b2783c1f624fbb4d9328ede105a1
+SHA512 (postgresql-10.22.tar.bz2) = 2e1ea75be7696ffbbb947351a8e8e55aaf067f86ad318308499a6a58797f0bf86227ed33e257e261c5c71ebba2f73ba514ef195a2394b91414ce6a0c3ab62532
+Size (postgresql-10.22.tar.bz2) = 19455874 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql11-client/Makefile b/databases/postgresql11-client/Makefile
index 34c8a3f08c5..30f4392438c 100644
--- a/databases/postgresql11-client/Makefile
+++ b/databases/postgresql11-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile
index dd63b613e84..f1b5e5c59e0 100644
--- a/databases/postgresql11-contrib/Makefile
+++ b/databases/postgresql11-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-docs/Makefile b/databases/postgresql11-docs/Makefile
index ebd576d8005..5ae97fca57d 100644
--- a/databases/postgresql11-docs/Makefile
+++ b/databases/postgresql11-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-docs/PLIST b/databases/postgresql11-docs/PLIST
index 6487ccab0c9..a5b74a96405 100644
--- a/databases/postgresql11-docs/PLIST
+++ b/databases/postgresql11-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2022/05/12 19:02:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2022/08/15 20:59:37 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -536,6 +536,7 @@ share/doc/postgresql/html/ecpg-errors.html
 share/doc/postgresql/html/ecpg-informix-compat.html
 share/doc/postgresql/html/ecpg-library.html
 share/doc/postgresql/html/ecpg-lo.html
+share/doc/postgresql/html/ecpg-oracle-compat.html
 share/doc/postgresql/html/ecpg-pgtypes.html
 share/doc/postgresql/html/ecpg-preproc.html
 share/doc/postgresql/html/ecpg-process.html
@@ -961,6 +962,7 @@ share/doc/postgresql/html/release-11-13.html
 share/doc/postgresql/html/release-11-14.html
 share/doc/postgresql/html/release-11-15.html
 share/doc/postgresql/html/release-11-16.html
+share/doc/postgresql/html/release-11-17.html
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11-4.html
diff --git a/databases/postgresql11-plperl/Makefile b/databases/postgresql11-plperl/Makefile
index 0a5af2eca8a..f5f21b50b5e 100644
--- a/databases/postgresql11-plperl/Makefile
+++ b/databases/postgresql11-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.19 2022/06/28 11:31:34 wiz Exp $
+#$ $NetBSD: Makefile,v 1.20 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-plpython/Makefile b/databases/postgresql11-plpython/Makefile
index 10fc62863fb..e7ea31f8611 100644
--- a/databases/postgresql11-plpython/Makefile
+++ b/databases/postgresql11-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2022/06/30 11:18:09 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-pltcl/Makefile b/databases/postgresql11-pltcl/Makefile
index 55912bb0372..721420fa52f 100644
--- a/databases/postgresql11-pltcl/Makefile
+++ b/databases/postgresql11-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 593beab43c1..224df04994a 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql11-server/PLIST b/databases/postgresql11-server/PLIST
index 54bcd1a0e93..b31e3ebe27a 100644
--- a/databases/postgresql11-server/PLIST
+++ b/databases/postgresql11-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/11/16 10:14:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/08/15 20:59:37 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -701,7 +701,6 @@ ${PLIST.nls}share/locale/ko/LC_MESSAGES/postgres-11.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/plpgsql-11.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/postgres-11.mo
 ${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/plpgsql-11.mo
-${PLIST.nls}share/locale/ro/LC_MESSAGES/plpgsql-11.mo
 ${PLIST.nls}share/locale/ru/LC_MESSAGES/plpgsql-11.mo
 ${PLIST.nls}share/locale/ru/LC_MESSAGES/postgres-11.mo
 ${PLIST.nls}share/locale/sv/LC_MESSAGES/plpgsql-11.mo
diff --git a/databases/postgresql11/Makefile b/databases/postgresql11/Makefile
index f69f4d1a97b..e34dec8b423 100644
--- a/databases/postgresql11/Makefile
+++ b/databases/postgresql11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2022/06/28 11:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/08/15 20:59:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql11-client>=${PKGVERSION_NOREV}:../../databases/postgresql11-client
diff --git a/databases/postgresql11/Makefile.common b/databases/postgresql11/Makefile.common
index 518481eecb3..c9d65a77928 100644
--- a/databases/postgresql11/Makefile.common
+++ b/databases/postgresql11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2022/05/21 07:25:34 nia Exp $
+# $NetBSD: Makefile.common,v 1.28 2022/08/15 20:59:36 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql11-pltcl/Makefile
 # used by databases/postgresql11-server/Makefile
 
-DISTNAME=	postgresql-11.16
+DISTNAME=	postgresql-11.17
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,9 +88,6 @@ CONFIGURE_ENV+=		pgac_cv_prog_cc_ldflags__Wl___as_needed=no
 # https://www.postgresql.org/message-id/E1X0yaj-000753-N6%40gemulon.postgresql.org
 BROKEN_ON_PLATFORM+=	*-*-alpha
 
-# "fatal error: catalog/pg_type_d.h: No such file or directory"
-MAKE_JOBS_SAFE=		no
-
 .if ${MACHINE_ARCH} == "sparc"
 CFLAGS.NetBSD+=		-D__sparc_v8__
 .endif
diff --git a/databases/postgresql11/distinfo b/databases/postgresql11/distinfo
index 741ef281dcf..2f5ba692a16 100644
--- a/databases/postgresql11/distinfo
+++ b/databases/postgresql11/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2022/05/12 19:02:43 adam Exp $
+$NetBSD: distinfo,v 1.24 2022/08/15 20:59:36 adam Exp $
 
-BLAKE2s (postgresql-11.16.tar.bz2) = 3e04ff94021dba90a1d48316b214d997d42eb4f806ec10f0aab99fe524df46b4
-SHA512 (postgresql-11.16.tar.bz2) = e1b6be0a97e60cdd95cd0ebc756b1de6abf2f33f41f6a80da3dff25483a30146fb6bf750ab787bb5bb4f2a04718946c7429e71f891cbd491001e9f9c2ea8e63c
-Size (postgresql-11.16.tar.bz2) = 20347100 bytes
+BLAKE2s (postgresql-11.17.tar.bz2) = f2b3f901935956881192d727f0cf1b5b65188f97279f2269bf584b495a6fd873
+SHA512 (postgresql-11.17.tar.bz2) = 35304279c06577eca134581490710db976edeac8cca169d3436fcdce8eebb18159459ea3b5ef403f6a8efe85542726f9960c4ca653da4619e081ce5869866032
+Size (postgresql-11.17.tar.bz2) = 20385599 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql12-client/Makefile b/databases/postgresql12-client/Makefile
index aa44c75396d..d4e678b4071 100644
--- a/databases/postgresql12-client/Makefile
+++ b/databases/postgresql12-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-client/PLIST b/databases/postgresql12-client/PLIST
index 9066733aed0..05c0c7d90fd 100644
--- a/databases/postgresql12-client/PLIST
+++ b/databases/postgresql12-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/11/16 12:15:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/08/15 20:59:37 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -976,7 +976,6 @@ ${PLIST.nls}share/locale/pl/LC_MESSAGES/ecpg-12.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/ecpglib6-12.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_config-12.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_controldata-12.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_ctl-12.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_test_fsync-12.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_test_timing-12.mo
 ${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/ecpg-12.mo
diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile
index f82cf77cac6..ad818411c20 100644
--- a/databases/postgresql12-contrib/Makefile
+++ b/databases/postgresql12-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-docs/Makefile b/databases/postgresql12-docs/Makefile
index 5f2e5196570..be3d93abda7 100644
--- a/databases/postgresql12-docs/Makefile
+++ b/databases/postgresql12-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-docs/PLIST b/databases/postgresql12-docs/PLIST
index 71b6efc1c09..5563941ddac 100644
--- a/databases/postgresql12-docs/PLIST
+++ b/databases/postgresql12-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2022/05/12 19:02:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/08/15 20:59:38 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -540,6 +540,7 @@ share/doc/postgresql/html/ecpg-errors.html
 share/doc/postgresql/html/ecpg-informix-compat.html
 share/doc/postgresql/html/ecpg-library.html
 share/doc/postgresql/html/ecpg-lo.html
+share/doc/postgresql/html/ecpg-oracle-compat.html
 share/doc/postgresql/html/ecpg-pgtypes.html
 share/doc/postgresql/html/ecpg-preproc.html
 share/doc/postgresql/html/ecpg-process.html
@@ -964,6 +965,7 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-12-1.html
 share/doc/postgresql/html/release-12-10.html
 share/doc/postgresql/html/release-12-11.html
+share/doc/postgresql/html/release-12-12.html
 share/doc/postgresql/html/release-12-2.html
 share/doc/postgresql/html/release-12-3.html
 share/doc/postgresql/html/release-12-4.html
diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile
index 1a9c414b500..d35dc96f5d3 100644
--- a/databases/postgresql12-plperl/Makefile
+++ b/databases/postgresql12-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.19 2022/06/28 11:31:35 wiz Exp $
+#$ $NetBSD: Makefile,v 1.20 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile
index 622cc61b67e..5a5cbb136eb 100644
--- a/databases/postgresql12-plpython/Makefile
+++ b/databases/postgresql12-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2022/06/30 11:18:09 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-pltcl/Makefile b/databases/postgresql12-pltcl/Makefile
index 7d5c04faa02..83424bacab9 100644
--- a/databases/postgresql12-pltcl/Makefile
+++ b/databases/postgresql12-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index d215c3a41de..433a71c9799 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql12/Makefile b/databases/postgresql12/Makefile
index 95c09e909d8..a55bb7a497f 100644
--- a/databases/postgresql12/Makefile
+++ b/databases/postgresql12/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/08/15 20:59:37 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql12-client>=${PKGVERSION_NOREV}:../../databases/postgresql12-client
diff --git a/databases/postgresql12/Makefile.common b/databases/postgresql12/Makefile.common
index 284fb505595..67a01ed8118 100644
--- a/databases/postgresql12/Makefile.common
+++ b/databases/postgresql12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2022/05/21 07:25:35 nia Exp $
+# $NetBSD: Makefile.common,v 1.21 2022/08/15 20:59:37 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql12-pltcl/Makefile
 # used by databases/postgresql12-server/Makefile
 
-DISTNAME=	postgresql-12.11
+DISTNAME=	postgresql-12.12
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,9 +88,6 @@ CONFIGURE_ENV+=		pgac_cv_prog_cc_ldflags__Wl___as_needed=no
 # https://www.postgresql.org/message-id/E1X0yaj-000753-N6%40gemulon.postgresql.org
 BROKEN_ON_PLATFORM+=	*-*-alpha
 
-# "fatal error: catalog/pg_type_d.h: No such file or directory"
-MAKE_JOBS_SAFE=		no
-
 .if ${MACHINE_ARCH} == "sparc"
 CFLAGS.NetBSD+=		-D__sparc_v8__
 .endif
diff --git a/databases/postgresql12/distinfo b/databases/postgresql12/distinfo
index 63f18f5d8fe..e6527e2970a 100644
--- a/databases/postgresql12/distinfo
+++ b/databases/postgresql12/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2022/05/12 19:02:44 adam Exp $
+$NetBSD: distinfo,v 1.17 2022/08/15 20:59:37 adam Exp $
 
-BLAKE2s (postgresql-12.11.tar.bz2) = 3b4a4bf765d658a603e7c54d2a6436918b842084780750db7bfb5accb970bf81
-SHA512 (postgresql-12.11.tar.bz2) = 705e9e1ccf8202062cce61069b5ddb7db5f804dd0736c620640ce5622b9e42fdcbc1417771e77d51aa54beb4562a09b4307f2ff7dec135bd0e31f4941ca36ac8
-Size (postgresql-12.11.tar.bz2) = 21086745 bytes
+BLAKE2s (postgresql-12.12.tar.bz2) = d5fcd5f8ab9c605f67059da9029420cc89825d669c351f9e435d9a93e9e55b92
+SHA512 (postgresql-12.12.tar.bz2) = eeff79279ac11db04fdddeb2c52ba1ec6b549223b862222540e1f659fbfc3617130699c22694b465bde46b1a4a665c01aef70b68b86d80e58a5657efd019407d
+Size (postgresql-12.12.tar.bz2) = 21089064 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index def2f041393..2ae3a200d8d 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2022/07/18 22:13:21 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index 2b822b3d73b..cee83e81b22 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-docs/Makefile b/databases/postgresql13-docs/Makefile
index 39d7c670a02..35fba68653f 100644
--- a/databases/postgresql13-docs/Makefile
+++ b/databases/postgresql13-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-docs/PLIST b/databases/postgresql13-docs/PLIST
index 397bd7a8fc9..168d61b053b 100644
--- a/databases/postgresql13-docs/PLIST
+++ b/databases/postgresql13-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2022/05/12 19:02:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/08/15 20:59:39 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -548,6 +548,7 @@ share/doc/postgresql/html/ecpg-errors.html
 share/doc/postgresql/html/ecpg-informix-compat.html
 share/doc/postgresql/html/ecpg-library.html
 share/doc/postgresql/html/ecpg-lo.html
+share/doc/postgresql/html/ecpg-oracle-compat.html
 share/doc/postgresql/html/ecpg-pgtypes.html
 share/doc/postgresql/html/ecpg-preproc.html
 share/doc/postgresql/html/ecpg-process.html
@@ -976,6 +977,7 @@ share/doc/postgresql/html/release-13-4.html
 share/doc/postgresql/html/release-13-5.html
 share/doc/postgresql/html/release-13-6.html
 share/doc/postgresql/html/release-13-7.html
+share/doc/postgresql/html/release-13-8.html
 share/doc/postgresql/html/release-13.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql13-plperl/Makefile b/databases/postgresql13-plperl/Makefile
index b7f719b5ee5..ed6f5d3598b 100644
--- a/databases/postgresql13-plperl/Makefile
+++ b/databases/postgresql13-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.14 2022/06/28 11:31:36 wiz Exp $
+#$ $NetBSD: Makefile,v 1.15 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-plpython/Makefile b/databases/postgresql13-plpython/Makefile
index dcb4101c2b0..64195cf27a2 100644
--- a/databases/postgresql13-plpython/Makefile
+++ b/databases/postgresql13-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/06/30 11:18:09 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-pltcl/Makefile b/databases/postgresql13-pltcl/Makefile
index 3e083abc03a..16c450340cf 100644
--- a/databases/postgresql13-pltcl/Makefile
+++ b/databases/postgresql13-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 6318e19e7e1..a3904eb71eb 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql13/Makefile b/databases/postgresql13/Makefile
index ca04576b229..49942908e02 100644
--- a/databases/postgresql13/Makefile
+++ b/databases/postgresql13/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/08/15 20:59:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql13-client>=${PKGVERSION_NOREV}:../../databases/postgresql13-client
diff --git a/databases/postgresql13/Makefile.common b/databases/postgresql13/Makefile.common
index 69fa6db0f3e..b68454f9cdb 100644
--- a/databases/postgresql13/Makefile.common
+++ b/databases/postgresql13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2022/05/21 07:25:35 nia Exp $
+# $NetBSD: Makefile.common,v 1.14 2022/08/15 20:59:38 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql13-pltcl/Makefile
 # used by databases/postgresql13-server/Makefile
 
-DISTNAME=	postgresql-13.7
+DISTNAME=	postgresql-13.8
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,9 +88,6 @@ CONFIGURE_ENV+=		pgac_cv_prog_cc_ldflags__Wl___as_needed=no
 # https://www.postgresql.org/message-id/E1X0yaj-000753-N6%40gemulon.postgresql.org
 BROKEN_ON_PLATFORM+=	*-*-alpha
 
-# "fatal error: catalog/pg_type_d.h: No such file or directory"
-MAKE_JOBS_SAFE=		no
-
 .if ${MACHINE_ARCH} == "sparc"
 CFLAGS.NetBSD+=		-D__sparc_v8__
 .endif
diff --git a/databases/postgresql13/distinfo b/databases/postgresql13/distinfo
index 2926ccb4e76..89a66307bcc 100644
--- a/databases/postgresql13/distinfo
+++ b/databases/postgresql13/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2022/05/12 19:02:45 adam Exp $
+$NetBSD: distinfo,v 1.14 2022/08/15 20:59:38 adam Exp $
 
-BLAKE2s (postgresql-13.7.tar.bz2) = 093828d075b411a73a1a8112697e9b5e2841ffc7e70951bf90c8daff47e29d8f
-SHA512 (postgresql-13.7.tar.bz2) = 9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41
-Size (postgresql-13.7.tar.bz2) = 21364433 bytes
+BLAKE2s (postgresql-13.8.tar.bz2) = 234ac7daf17806f31c81f09542663c43f98e96f078aebb8354213d14ae3af86a
+SHA512 (postgresql-13.8.tar.bz2) = 3b39448b291342a5e9b610d410c222aeb85f8acf95632e73e138ae316133af3dadc795a6e706f6447f543cf10df3c786da4f1afa1d91489b50eb77e2d9ed5d84
+Size (postgresql-13.8.tar.bz2) = 21397381 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9
diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile
index d796ea4e337..4f19b32ffbd 100644
--- a/databases/postgresql14-client/Makefile
+++ b/databases/postgresql14-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2022/07/18 22:13:21 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql14/Makefile.common"
diff --git a/databases/postgresql14-contrib/Makefile b/databases/postgresql14-contrib/Makefile
index 0f27499c033..ccab68f0df7 100644
--- a/databases/postgresql14-contrib/Makefile
+++ b/databases/postgresql14-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql14/Makefile.common"
diff --git a/databases/postgresql14-docs/Makefile b/databases/postgresql14-docs/Makefile
index 2b2cc6b96ba..3d4a51f3a83 100644
--- a/databases/postgresql14-docs/Makefile
+++ b/databases/postgresql14-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/08/15 20:59:40 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql14/Makefile.common"
diff --git a/databases/postgresql14-docs/PLIST b/databases/postgresql14-docs/PLIST
index 46c3ecc7b05..fa57fae89c2 100644
--- a/databases/postgresql14-docs/PLIST
+++ b/databases/postgresql14-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/06/17 18:16:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/08/15 20:59:40 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -554,6 +554,7 @@ share/doc/postgresql/html/ecpg-errors.html
 share/doc/postgresql/html/ecpg-informix-compat.html
 share/doc/postgresql/html/ecpg-library.html
 share/doc/postgresql/html/ecpg-lo.html
+share/doc/postgresql/html/ecpg-oracle-compat.html
 share/doc/postgresql/html/ecpg-pgtypes.html
 share/doc/postgresql/html/ecpg-preproc.html
 share/doc/postgresql/html/ecpg-process.html
@@ -989,6 +990,7 @@ share/doc/postgresql/html/release-14-1.html
 share/doc/postgresql/html/release-14-2.html
 share/doc/postgresql/html/release-14-3.html
 share/doc/postgresql/html/release-14-4.html
+share/doc/postgresql/html/release-14-5.html
 share/doc/postgresql/html/release-14.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql14-plperl/Makefile b/databases/postgresql14-plperl/Makefile
index 99fb1dbda67..7f24f4b782c 100644
--- a/databases/postgresql14-plperl/Makefile
+++ b/databases/postgresql14-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.7 2022/06/28 11:31:37 wiz Exp $
+#$ $NetBSD: Makefile,v 1.8 2022/08/15 20:59:40 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server
diff --git a/databases/postgresql14-plpython/Makefile b/databases/postgresql14-plpython/Makefile
index 15724fbaa2c..2c596550e59 100644
--- a/databases/postgresql14-plpython/Makefile
+++ b/databases/postgresql14-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2022/06/30 11:18:09 nia Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/15 20:59:40 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server
diff --git a/databases/postgresql14-pltcl/Makefile b/databases/postgresql14-pltcl/Makefile
index 9d3824a4bca..ce9344417f5 100644
--- a/databases/postgresql14-pltcl/Makefile
+++ b/databases/postgresql14-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/08/15 20:59:40 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 3d820622e08..095fc703c15 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/08/15 20:59:40 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql14-server/PLIST b/databases/postgresql14-server/PLIST
index 54785cfc130..c13aa3b9c47 100644
--- a/databases/postgresql14-server/PLIST
+++ b/databases/postgresql14-server/PLIST
@@ -1,6 +1,6 @@
 ${PLIST.llvm}${PLIST.gssapi}lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
 ${PLIST.llvm}${PLIST.gssapi}lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
-@comment $NetBSD: PLIST,v 1.3 2022/04/25 08:09:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/08/15 20:59:40 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -693,6 +693,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mmgr/portalmem.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/sort/logtape.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/sort/qsort_interruptible.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc
diff --git a/databases/postgresql14/Makefile b/databases/postgresql14/Makefile
index 6b4d1244c0d..9eb37cf3087 100644
--- a/databases/postgresql14/Makefile
+++ b/databases/postgresql14/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/08/15 20:59:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/14-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql14-client>=${PKGVERSION_NOREV}:../../databases/postgresql14-client
diff --git a/databases/postgresql14/Makefile.common b/databases/postgresql14/Makefile.common
index 62498ef7be0..ad0678388fa 100644
--- a/databases/postgresql14/Makefile.common
+++ b/databases/postgresql14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2022/06/17 18:16:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2022/08/15 20:59:39 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql14-pltcl/Makefile
 # used by databases/postgresql14-server/Makefile
 
-DISTNAME=	postgresql-14.4
+DISTNAME=	postgresql-14.5
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,9 +88,6 @@ CONFIGURE_ENV+=		pgac_cv_prog_cc_ldflags__Wl___as_needed=no
 # https://www.postgresql.org/message-id/E1X0yaj-000753-N6%40gemulon.postgresql.org
 BROKEN_ON_PLATFORM+=	*-*-alpha
 
-# "fatal error: catalog/pg_type_d.h: No such file or directory"
-MAKE_JOBS_SAFE=		no
-
 .if ${MACHINE_ARCH} == "sparc"
 CFLAGS.NetBSD+=		-D__sparc_v8__
 .endif
diff --git a/databases/postgresql14/distinfo b/databases/postgresql14/distinfo
index 71dfe24582b..47241b213b6 100644
--- a/databases/postgresql14/distinfo
+++ b/databases/postgresql14/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2022/06/17 18:16:51 adam Exp $
+$NetBSD: distinfo,v 1.8 2022/08/15 20:59:39 adam Exp $
 
-BLAKE2s (postgresql-14.4.tar.bz2) = 12faf343c9439b085dd83fc6c097131871e06505bcf2a1b1db2db2a9ce291a16
-SHA512 (postgresql-14.4.tar.bz2) = dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb
-Size (postgresql-14.4.tar.bz2) = 22094218 bytes
+BLAKE2s (postgresql-14.5.tar.bz2) = 047d0dda525a04a62f6ed74e00ac5efe694cb17630684de00dd6c4134f131175
+SHA512 (postgresql-14.5.tar.bz2) = 3051c5ab729f6a55952c6108098b022517398b1de64f7fefbdd6c806c7e2eb0637d00f3c98a6203c5bee654656528c4ff3530db5a69470e7888864c77900178a
+Size (postgresql-14.5.tar.bz2) = 22132996 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9