On 10/12 10:39, Jeremy Evans wrote:
> Here's a diff to upgrade PostgreSQL from 13.4 to 14.0, including
> dependent ports.  In general, we don't commit a PostgreSQL update until
> ${MAJOR_VERSION}.1 is released, but this should be useful for early
> testing. This diff includes changes to:
> 
> databases/postgresql
> databases/postgresql-previous
> databases/citus (update)
> databases/pg_statsinfo (update and many patches)
> databases/pgadmin3 (patch)
> databases/postgresql-pllua (update)
> databases/skytools (patch)
> databases/timescaledb (temporarily mark as BROKEN as PG 14 support
> hasn't been released)

Here's an updated diff for PostgreSQL 14.1, with the following
changes compared to the previous diff:

databases/postgresql (14.0 -> 14.1)
databases/postgresql-previous (13.4 -> 13.5)
databases/timescaledb (BROKEN -> 2.5.0)

Note that denis@ already sent a more complete update for
databases/timescaledb, but it hasn't been committed yet.

The postgresql-pllua diff is for the same version, but has
changed slightly due to recent impovements by sthen@.

I think this is ready to test in a bulk.

Thanks,
Jeremy

Index: databases/postgresql/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.278
diff -u -p -r1.278 Makefile
--- databases/postgresql/Makefile       7 Nov 2021 14:27:44 -0000       1.278
+++ databases/postgresql/Makefile       19 Nov 2021 21:21:32 -0000
@@ -7,12 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=       13.4
-REVISION=      0
-REVISION-server=       1
-REVISION-plpython=     1
-
-PREV_MAJOR=    12
+VERSION=       14.1
+PREV_MAJOR=    13
 DISTNAME=      postgresql-${VERSION}
 PKGNAME-main=  postgresql-client-${VERSION}
 PKGNAME-server=        postgresql-server-${VERSION}
@@ -27,7 +23,7 @@ CATEGORIES=   databases
 SHARED_LIBS=   ecpg            7.10 \
                ecpg_compat     4.10 \
                pgtypes         4.9 \
-               pq              6.12
+               pq              6.13
 
 HOMEPAGE=      https://www.postgresql.org/
 
Index: databases/postgresql/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.90
diff -u -p -r1.90 distinfo
--- databases/postgresql/distinfo       10 Sep 2021 14:07:45 -0000      1.90
+++ databases/postgresql/distinfo       19 Nov 2021 21:21:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-13.4.tar.gz) = Wde8Uj54VwxUmHb+0pfsPkbdMH6Q9bHSL0kYEZHPID4=
-SIZE (postgresql-13.4.tar.gz) = 27687091
+SHA256 (postgresql-14.1.tar.gz) = spAwUl4TFNZ29B5gB6ltRIm6DQP6k+Z7R3wdU4Z5DI8=
+SIZE (postgresql-14.1.tar.gz) = 28666442
Index: databases/postgresql/pkg/PLIST-contrib
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST-contrib
--- databases/postgresql/pkg/PLIST-contrib      9 Feb 2021 20:01:36 -0000       
1.22
+++ databases/postgresql/pkg/PLIST-contrib      19 Nov 2021 21:21:33 -0000
@@ -3,8 +3,8 @@
 @conflict postgresql-server-<8.4.3
 @pkgpath devel/uuid,-pgsql
 @bin bin/oid2name
+@bin bin/pg_amcheck
 @bin bin/pg_archivecleanup
-@bin bin/pg_standby
 @bin bin/pg_test_fsync
 @bin bin/pg_test_timing
 @bin bin/pgbench
@@ -32,12 +32,14 @@
 @so lib/postgresql/lo.so
 @so lib/postgresql/ltree.so
 @so lib/postgresql/moddatetime.so
+@so lib/postgresql/old_snapshot.so
 @so lib/postgresql/pageinspect.so
 @so lib/postgresql/passwordcheck.so
 @so lib/postgresql/pg_buffercache.so
 @so lib/postgresql/pg_freespacemap.so
 @so lib/postgresql/pg_prewarm.so
 @so lib/postgresql/pg_stat_statements.so
+@so lib/postgresql/pg_surgery.so
 @so lib/postgresql/pg_trgm.so
 @so lib/postgresql/pg_visibility.so
 @so lib/postgresql/pgcrypto.so
@@ -55,8 +57,8 @@
 @so lib/postgresql/unaccent.so
 @so lib/postgresql/uuid-ossp.so
 @man man/man1/oid2name.1
+@man man/man1/pg_amcheck.1
 @man man/man1/pg_archivecleanup.1
-@man man/man1/pg_standby.1
 @man man/man1/pg_test_fsync.1
 @man man/man1/pg_test_timing.1
 @man man/man1/pgbench.1
@@ -69,6 +71,7 @@ share/postgresql/extension/adminpack.con
 share/postgresql/extension/amcheck--1.0--1.1.sql
 share/postgresql/extension/amcheck--1.0.sql
 share/postgresql/extension/amcheck--1.1--1.2.sql
+share/postgresql/extension/amcheck--1.2--1.3.sql
 share/postgresql/extension/amcheck.control
 share/postgresql/extension/autoinc--1.0.sql
 share/postgresql/extension/autoinc.control
@@ -89,6 +92,7 @@ share/postgresql/extension/btree_gist--1
 share/postgresql/extension/btree_gist--1.2.sql
 share/postgresql/extension/btree_gist--1.3--1.4.sql
 share/postgresql/extension/btree_gist--1.4--1.5.sql
+share/postgresql/extension/btree_gist--1.5--1.6.sql
 share/postgresql/extension/btree_gist.control
 share/postgresql/extension/citext--1.0--1.1.sql
 share/postgresql/extension/citext--1.1--1.2.sql
@@ -103,6 +107,7 @@ share/postgresql/extension/cube--1.1--1.
 share/postgresql/extension/cube--1.2--1.3.sql
 share/postgresql/extension/cube--1.2.sql
 share/postgresql/extension/cube--1.3--1.4.sql
+share/postgresql/extension/cube--1.4--1.5.sql
 share/postgresql/extension/cube.control
 share/postgresql/extension/dblink--1.0--1.1.sql
 share/postgresql/extension/dblink--1.1--1.2.sql
@@ -120,7 +125,6 @@ share/postgresql/extension/file_fdw.cont
 share/postgresql/extension/fuzzystrmatch--1.0--1.1.sql
 share/postgresql/extension/fuzzystrmatch--1.1.sql
 share/postgresql/extension/fuzzystrmatch.control
-share/postgresql/extension/hstore--1.0--1.1.sql
 share/postgresql/extension/hstore--1.1--1.2.sql
 share/postgresql/extension/hstore--1.2--1.3.sql
 share/postgresql/extension/hstore--1.3--1.4.sql
@@ -128,6 +132,7 @@ share/postgresql/extension/hstore--1.4--
 share/postgresql/extension/hstore--1.4.sql
 share/postgresql/extension/hstore--1.5--1.6.sql
 share/postgresql/extension/hstore--1.6--1.7.sql
+share/postgresql/extension/hstore--1.7--1.8.sql
 share/postgresql/extension/hstore.control
 share/postgresql/extension/hstore_plperl--1.0.sql
 share/postgresql/extension/hstore_plperl.control
@@ -142,6 +147,8 @@ share/postgresql/extension/intarray--1.0
 share/postgresql/extension/intarray--1.1--1.2.sql
 share/postgresql/extension/intarray--1.2--1.3.sql
 share/postgresql/extension/intarray--1.2.sql
+share/postgresql/extension/intarray--1.3--1.4.sql
+share/postgresql/extension/intarray--1.4--1.5.sql
 share/postgresql/extension/intarray.control
 share/postgresql/extension/isn--1.0--1.1.sql
 share/postgresql/extension/isn--1.1--1.2.sql
@@ -160,6 +167,8 @@ share/postgresql/extension/ltree--1.1.sq
 share/postgresql/extension/ltree.control
 share/postgresql/extension/moddatetime--1.0.sql
 share/postgresql/extension/moddatetime.control
+share/postgresql/extension/old_snapshot--1.0.sql
+share/postgresql/extension/old_snapshot.control
 share/postgresql/extension/pageinspect--1.0--1.1.sql
 share/postgresql/extension/pageinspect--1.1--1.2.sql
 share/postgresql/extension/pageinspect--1.2--1.3.sql
@@ -169,6 +178,7 @@ share/postgresql/extension/pageinspect--
 share/postgresql/extension/pageinspect--1.5.sql
 share/postgresql/extension/pageinspect--1.6--1.7.sql
 share/postgresql/extension/pageinspect--1.7--1.8.sql
+share/postgresql/extension/pageinspect--1.8--1.9.sql
 share/postgresql/extension/pageinspect.control
 share/postgresql/extension/pg_buffercache--1.0--1.1.sql
 share/postgresql/extension/pg_buffercache--1.1--1.2.sql
@@ -192,13 +202,17 @@ share/postgresql/extension/pg_stat_state
 share/postgresql/extension/pg_stat_statements--1.5--1.6.sql
 share/postgresql/extension/pg_stat_statements--1.6--1.7.sql
 share/postgresql/extension/pg_stat_statements--1.7--1.8.sql
+share/postgresql/extension/pg_stat_statements--1.8--1.9.sql
 share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_surgery--1.0.sql
+share/postgresql/extension/pg_surgery.control
 share/postgresql/extension/pg_trgm--1.0--1.1.sql
 share/postgresql/extension/pg_trgm--1.1--1.2.sql
 share/postgresql/extension/pg_trgm--1.2--1.3.sql
 share/postgresql/extension/pg_trgm--1.3--1.4.sql
 share/postgresql/extension/pg_trgm--1.3.sql
 share/postgresql/extension/pg_trgm--1.4--1.5.sql
+share/postgresql/extension/pg_trgm--1.5--1.6.sql
 share/postgresql/extension/pg_trgm.control
 share/postgresql/extension/pg_visibility--1.0--1.1.sql
 share/postgresql/extension/pg_visibility--1.1--1.2.sql
@@ -220,6 +234,7 @@ share/postgresql/extension/pgstattuple--
 share/postgresql/extension/pgstattuple--1.4--1.5.sql
 share/postgresql/extension/pgstattuple--1.4.sql
 share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/postgres_fdw--1.0--1.1.sql
 share/postgresql/extension/postgres_fdw--1.0.sql
 share/postgresql/extension/postgres_fdw.control
 share/postgresql/extension/refint--1.0.sql
@@ -228,6 +243,7 @@ share/postgresql/extension/seg--1.0--1.1
 share/postgresql/extension/seg--1.1--1.2.sql
 share/postgresql/extension/seg--1.1.sql
 share/postgresql/extension/seg--1.2--1.3.sql
+share/postgresql/extension/seg--1.3--1.4.sql
 share/postgresql/extension/seg.control
 share/postgresql/extension/sslinfo--1.0--1.1.sql
 share/postgresql/extension/sslinfo--1.1--1.2.sql
Index: databases/postgresql/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.102
diff -u -p -r1.102 PLIST-docs
--- databases/postgresql/pkg/PLIST-docs 10 Sep 2021 14:07:45 -0000      1.102
+++ databases/postgresql/pkg/PLIST-docs 19 Nov 2021 21:21:33 -0000
@@ -25,6 +25,7 @@ share/doc/postgresql/html/app-initdb.htm
 share/doc/postgresql/html/app-pg-ctl.html
 share/doc/postgresql/html/app-pg-dumpall.html
 share/doc/postgresql/html/app-pg-isready.html
+share/doc/postgresql/html/app-pgamcheck.html
 share/doc/postgresql/html/app-pgbasebackup.html
 share/doc/postgresql/html/app-pgchecksums.html
 share/doc/postgresql/html/app-pgconfig.html
@@ -154,6 +155,7 @@ share/doc/postgresql/html/catalog-pg-use
 share/doc/postgresql/html/catalogs-overview.html
 share/doc/postgresql/html/catalogs.html
 share/doc/postgresql/html/charset.html
+share/doc/postgresql/html/checksums.html
 share/doc/postgresql/html/citext.html
 share/doc/postgresql/html/client-authentication-problems.html
 share/doc/postgresql/html/client-authentication.html
@@ -277,6 +279,7 @@ share/doc/postgresql/html/ecpg-sql-alloc
 share/doc/postgresql/html/ecpg-sql-commands.html
 share/doc/postgresql/html/ecpg-sql-connect.html
 share/doc/postgresql/html/ecpg-sql-deallocate-descriptor.html
+share/doc/postgresql/html/ecpg-sql-declare-statement.html
 share/doc/postgresql/html/ecpg-sql-declare.html
 share/doc/postgresql/html/ecpg-sql-describe.html
 share/doc/postgresql/html/ecpg-sql-disconnect.html
@@ -451,7 +454,11 @@ share/doc/postgresql/html/infoschema-rol
 share/doc/postgresql/html/infoschema-role-table-grants.html
 share/doc/postgresql/html/infoschema-role-udt-grants.html
 share/doc/postgresql/html/infoschema-role-usage-grants.html
+share/doc/postgresql/html/infoschema-routine-column-usage.html
 share/doc/postgresql/html/infoschema-routine-privileges.html
+share/doc/postgresql/html/infoschema-routine-routine-usage.html
+share/doc/postgresql/html/infoschema-routine-sequence-usage.html
+share/doc/postgresql/html/infoschema-routine-table-usage.html
 share/doc/postgresql/html/infoschema-routines.html
 share/doc/postgresql/html/infoschema-schema.html
 share/doc/postgresql/html/infoschema-schemata.html
@@ -475,6 +482,7 @@ share/doc/postgresql/html/infoschema-vie
 share/doc/postgresql/html/infoschema-view-routine-usage.html
 share/doc/postgresql/html/infoschema-view-table-usage.html
 share/doc/postgresql/html/infoschema-views.html
+share/doc/postgresql/html/install-binaries.html
 share/doc/postgresql/html/install-getsource.html
 share/doc/postgresql/html/install-post.html
 share/doc/postgresql/html/install-procedure.html
@@ -514,6 +522,7 @@ share/doc/postgresql/html/libpq-notice-p
 share/doc/postgresql/html/libpq-notify.html
 share/doc/postgresql/html/libpq-pgpass.html
 share/doc/postgresql/html/libpq-pgservice.html
+share/doc/postgresql/html/libpq-pipeline-mode.html
 share/doc/postgresql/html/libpq-single-row-mode.html
 share/doc/postgresql/html/libpq-ssl.html
 share/doc/postgresql/html/libpq-status.html
@@ -528,7 +537,6 @@ share/doc/postgresql/html/lo-intro.html
 share/doc/postgresql/html/lo.html
 share/doc/postgresql/html/locale.html
 share/doc/postgresql/html/locking-indexes.html
-share/doc/postgresql/html/log-shipping-alternative.html
 share/doc/postgresql/html/logfile-maintenance.html
 share/doc/postgresql/html/logical-replication-architecture.html
 share/doc/postgresql/html/logical-replication-config.html
@@ -545,7 +553,9 @@ share/doc/postgresql/html/logicaldecodin
 share/doc/postgresql/html/logicaldecoding-explanation.html
 share/doc/postgresql/html/logicaldecoding-output-plugin.html
 share/doc/postgresql/html/logicaldecoding-sql.html
+share/doc/postgresql/html/logicaldecoding-streaming.html
 share/doc/postgresql/html/logicaldecoding-synchronous.html
+share/doc/postgresql/html/logicaldecoding-two-phase-commits.html
 share/doc/postgresql/html/logicaldecoding-walsender.html
 share/doc/postgresql/html/logicaldecoding-writer.html
 share/doc/postgresql/html/logicaldecoding.html
@@ -573,6 +583,7 @@ share/doc/postgresql/html/nls.html
 share/doc/postgresql/html/non-durability.html
 share/doc/postgresql/html/notation.html
 share/doc/postgresql/html/oid2name.html
+share/doc/postgresql/html/oldsnapshot.html
 share/doc/postgresql/html/overview.html
 share/doc/postgresql/html/pageinspect.html
 share/doc/postgresql/html/pagelayout.svg
@@ -590,9 +601,9 @@ share/doc/postgresql/html/pgcrypto.html
 share/doc/postgresql/html/pgfreespacemap.html
 share/doc/postgresql/html/pgprewarm.html
 share/doc/postgresql/html/pgrowlocks.html
-share/doc/postgresql/html/pgstandby.html
 share/doc/postgresql/html/pgstatstatements.html
 share/doc/postgresql/html/pgstattuple.html
+share/doc/postgresql/html/pgsurgery.html
 share/doc/postgresql/html/pgtestfsync.html
 share/doc/postgresql/html/pgtesttiming.html
 share/doc/postgresql/html/pgtrgm.html
@@ -656,6 +667,7 @@ share/doc/postgresql/html/pltcl.html
 share/doc/postgresql/html/populate.html
 share/doc/postgresql/html/postgres-fdw.html
 share/doc/postgresql/html/postgres-user.html
+share/doc/postgresql/html/predefined-roles.html
 share/doc/postgresql/html/preface.html
 share/doc/postgresql/html/preventing-server-spoofing.html
 share/doc/postgresql/html/progress-reporting.html
@@ -691,11 +703,8 @@ share/doc/postgresql/html/regress-run.ht
 share/doc/postgresql/html/regress-tap.html
 share/doc/postgresql/html/regress-variant.html
 share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-13-1.html
-share/doc/postgresql/html/release-13-2.html
-share/doc/postgresql/html/release-13-3.html
-share/doc/postgresql/html/release-13-4.html
-share/doc/postgresql/html/release-13.html
+share/doc/postgresql/html/release-14-1.html
+share/doc/postgresql/html/release-14.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
@@ -765,8 +774,11 @@ share/doc/postgresql/html/spi-spi-cursor
 share/doc/postgresql/html/spi-spi-cursor-open-with-args.html
 share/doc/postgresql/html/spi-spi-cursor-open-with-paramlist.html
 share/doc/postgresql/html/spi-spi-cursor-open.html
+share/doc/postgresql/html/spi-spi-cursor-parse-open.html
 share/doc/postgresql/html/spi-spi-exec.html
 share/doc/postgresql/html/spi-spi-execp.html
+share/doc/postgresql/html/spi-spi-execute-extended.html
+share/doc/postgresql/html/spi-spi-execute-plan-extended.html
 share/doc/postgresql/html/spi-spi-execute-plan-with-paramlist.html
 share/doc/postgresql/html/spi-spi-execute-plan.html
 share/doc/postgresql/html/spi-spi-execute-with-args.html
@@ -791,6 +803,7 @@ share/doc/postgresql/html/spi-spi-modify
 share/doc/postgresql/html/spi-spi-palloc.html
 share/doc/postgresql/html/spi-spi-pfree.html
 share/doc/postgresql/html/spi-spi-prepare-cursor.html
+share/doc/postgresql/html/spi-spi-prepare-extended.html
 share/doc/postgresql/html/spi-spi-prepare-params.html
 share/doc/postgresql/html/spi-spi-prepare.html
 share/doc/postgresql/html/spi-spi-register-relation.html
@@ -1076,6 +1089,7 @@ share/doc/postgresql/html/uuid-ossp.html
 share/doc/postgresql/html/vacuumlo.html
 share/doc/postgresql/html/view-pg-available-extension-versions.html
 share/doc/postgresql/html/view-pg-available-extensions.html
+share/doc/postgresql/html/view-pg-backend-memory-contexts.html
 share/doc/postgresql/html/view-pg-config.html
 share/doc/postgresql/html/view-pg-cursors.html
 share/doc/postgresql/html/view-pg-file-settings.html
@@ -1097,6 +1111,7 @@ share/doc/postgresql/html/view-pg-sequen
 share/doc/postgresql/html/view-pg-settings.html
 share/doc/postgresql/html/view-pg-shadow.html
 share/doc/postgresql/html/view-pg-shmem-allocations.html
+share/doc/postgresql/html/view-pg-stats-ext-exprs.html
 share/doc/postgresql/html/view-pg-stats-ext.html
 share/doc/postgresql/html/view-pg-stats.html
 share/doc/postgresql/html/view-pg-tables.html
Index: databases/postgresql/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v
retrieving revision 1.32
diff -u -p -r1.32 PLIST-main
--- databases/postgresql/pkg/PLIST-main 9 Feb 2021 20:01:37 -0000       1.32
+++ databases/postgresql/pkg/PLIST-main 19 Nov 2021 21:21:33 -0000
@@ -121,10 +121,13 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man3/SPI_cursor_open.3
 @man man/man3/SPI_cursor_open_with_args.3
 @man man/man3/SPI_cursor_open_with_paramlist.3
+@man man/man3/SPI_cursor_parse_open.3
 @man man/man3/SPI_exec.3
 @man man/man3/SPI_execp.3
 @man man/man3/SPI_execute.3
+@man man/man3/SPI_execute_extended.3
 @man man/man3/SPI_execute_plan.3
+@man man/man3/SPI_execute_plan_extended.3
 @man man/man3/SPI_execute_plan_with_paramlist.3
 @man man/man3/SPI_execute_with_args.3
 @man man/man3/SPI_finish.3
@@ -148,6 +151,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man3/SPI_pfree.3
 @man man/man3/SPI_prepare.3
 @man man/man3/SPI_prepare_cursor.3
+@man man/man3/SPI_prepare_extended.3
 @man man/man3/SPI_prepare_params.3
 @man man/man3/SPI_register_relation.3
 @man man/man3/SPI_register_trigger_data.3
Index: databases/postgresql/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST-server
--- databases/postgresql/pkg/PLIST-server       1 Mar 2021 13:40:08 -0000       
1.42
+++ databases/postgresql/pkg/PLIST-server       19 Nov 2021 21:21:34 -0000
@@ -87,10 +87,12 @@ include/postgresql/server/access/spgist_
 include/postgresql/server/access/spgxlog.h
 include/postgresql/server/access/stratnum.h
 include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/syncscan.h
 include/postgresql/server/access/sysattr.h
 include/postgresql/server/access/table.h
 include/postgresql/server/access/tableam.h
 include/postgresql/server/access/timeline.h
+include/postgresql/server/access/toast_compression.h
 include/postgresql/server/access/toast_helper.h
 include/postgresql/server/access/toast_internals.h
 include/postgresql/server/access/transam.h
@@ -103,6 +105,7 @@ include/postgresql/server/access/twophas
 include/postgresql/server/access/twophase_rmgr.h
 include/postgresql/server/access/valid.h
 include/postgresql/server/access/visibilitymap.h
+include/postgresql/server/access/visibilitymapdefs.h
 include/postgresql/server/access/xact.h
 include/postgresql/server/access/xlog.h
 include/postgresql/server/access/xlog_internal.h
@@ -127,7 +130,6 @@ include/postgresql/server/catalog/indexi
 include/postgresql/server/catalog/namespace.h
 include/postgresql/server/catalog/objectaccess.h
 include/postgresql/server/catalog/objectaddress.h
-include/postgresql/server/catalog/opfam_internal.h
 include/postgresql/server/catalog/partition.h
 include/postgresql/server/catalog/pg_aggregate.h
 include/postgresql/server/catalog/pg_aggregate_d.h
@@ -257,6 +259,7 @@ include/postgresql/server/catalog/pg_use
 include/postgresql/server/catalog/schemapg.h
 include/postgresql/server/catalog/storage.h
 include/postgresql/server/catalog/storage_xlog.h
+include/postgresql/server/catalog/system_fk_info.h
 include/postgresql/server/catalog/toasting.h
 include/postgresql/server/commands/
 include/postgresql/server/commands/alter.h
@@ -266,6 +269,7 @@ include/postgresql/server/commands/colla
 include/postgresql/server/commands/comment.h
 include/postgresql/server/commands/conversioncmds.h
 include/postgresql/server/commands/copy.h
+include/postgresql/server/commands/copyfrom_internal.h
 include/postgresql/server/commands/createas.h
 include/postgresql/server/commands/dbcommands.h
 include/postgresql/server/commands/dbcommands_xlog.h
@@ -301,10 +305,12 @@ include/postgresql/server/common/checksu
 include/postgresql/server/common/config_info.h
 include/postgresql/server/common/connect.h
 include/postgresql/server/common/controldata_utils.h
+include/postgresql/server/common/cryptohash.h
 include/postgresql/server/common/fe_memutils.h
 include/postgresql/server/common/file_perm.h
 include/postgresql/server/common/file_utils.h
 include/postgresql/server/common/hashfn.h
+include/postgresql/server/common/hmac.h
 include/postgresql/server/common/int.h
 include/postgresql/server/common/int128.h
 include/postgresql/server/common/ip.h
@@ -320,17 +326,20 @@ include/postgresql/server/common/relpath
 include/postgresql/server/common/restricted_token.h
 include/postgresql/server/common/saslprep.h
 include/postgresql/server/common/scram-common.h
+include/postgresql/server/common/sha1.h
 include/postgresql/server/common/sha2.h
 include/postgresql/server/common/shortest_dec.h
 include/postgresql/server/common/string.h
 include/postgresql/server/common/unicode_combining_table.h
 include/postgresql/server/common/unicode_norm.h
+include/postgresql/server/common/unicode_norm_hashfunc.h
 include/postgresql/server/common/unicode_norm_table.h
 include/postgresql/server/common/unicode_normprops_table.h
 include/postgresql/server/common/username.h
 include/postgresql/server/datatype/
 include/postgresql/server/datatype/timestamp.h
 include/postgresql/server/executor/
+include/postgresql/server/executor/execAsync.h
 include/postgresql/server/executor/execExpr.h
 include/postgresql/server/executor/execParallel.h
 include/postgresql/server/executor/execPartition.h
@@ -361,6 +370,7 @@ include/postgresql/server/executor/nodeI
 include/postgresql/server/executor/nodeLimit.h
 include/postgresql/server/executor/nodeLockRows.h
 include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMemoize.h
 include/postgresql/server/executor/nodeMergeAppend.h
 include/postgresql/server/executor/nodeMergejoin.h
 include/postgresql/server/executor/nodeModifyTable.h
@@ -376,6 +386,7 @@ include/postgresql/server/executor/nodeS
 include/postgresql/server/executor/nodeSubplan.h
 include/postgresql/server/executor/nodeSubqueryscan.h
 include/postgresql/server/executor/nodeTableFuncscan.h
+include/postgresql/server/executor/nodeTidrangescan.h
 include/postgresql/server/executor/nodeTidscan.h
 include/postgresql/server/executor/nodeUnique.h
 include/postgresql/server/executor/nodeValuesscan.h
@@ -402,10 +413,14 @@ include/postgresql/server/fe_utils/
 include/postgresql/server/fe_utils/archive.h
 include/postgresql/server/fe_utils/cancel.h
 include/postgresql/server/fe_utils/conditional.h
+include/postgresql/server/fe_utils/connect_utils.h
 include/postgresql/server/fe_utils/mbprint.h
+include/postgresql/server/fe_utils/option_utils.h
+include/postgresql/server/fe_utils/parallel_slot.h
 include/postgresql/server/fe_utils/print.h
 include/postgresql/server/fe_utils/psqlscan.h
 include/postgresql/server/fe_utils/psqlscan_int.h
+include/postgresql/server/fe_utils/query_utils.h
 include/postgresql/server/fe_utils/recovery_gen.h
 include/postgresql/server/fe_utils/simple_list.h
 include/postgresql/server/fe_utils/string_utils.h
@@ -433,6 +448,7 @@ include/postgresql/server/lib/pairinghea
 include/postgresql/server/lib/qunique.h
 include/postgresql/server/lib/rbtree.h
 include/postgresql/server/lib/simplehash.h
+include/postgresql/server/lib/sort_template.h
 include/postgresql/server/lib/stringinfo.h
 include/postgresql/server/libpq/
 include/postgresql/server/libpq/auth.h
@@ -471,6 +487,7 @@ include/postgresql/server/nodes/primnode
 include/postgresql/server/nodes/print.h
 include/postgresql/server/nodes/readfuncs.h
 include/postgresql/server/nodes/replnodes.h
+include/postgresql/server/nodes/subscripting.h
 include/postgresql/server/nodes/supportnodes.h
 include/postgresql/server/nodes/tidbitmap.h
 include/postgresql/server/nodes/value.h
@@ -580,6 +597,8 @@ include/postgresql/server/port/openbsd.h
 include/postgresql/server/port/pg_bitutils.h
 include/postgresql/server/port/pg_bswap.h
 include/postgresql/server/port/pg_crc32c.h
+include/postgresql/server/port/pg_iovec.h
+include/postgresql/server/port/pg_pthread.h
 include/postgresql/server/port/solaris.h
 @comment include/postgresql/server/port/win32/
 @comment include/postgresql/server/port/win32.h
@@ -655,6 +674,7 @@ include/postgresql/server/rewrite/rewrit
 include/postgresql/server/rewrite/rewriteHandler.h
 include/postgresql/server/rewrite/rewriteManip.h
 include/postgresql/server/rewrite/rewriteRemove.h
+include/postgresql/server/rewrite/rewriteSearchCycle.h
 include/postgresql/server/rewrite/rewriteSupport.h
 include/postgresql/server/rewrite/rowsecurity.h
 include/postgresql/server/rusagestub.h
@@ -663,6 +683,8 @@ include/postgresql/server/snowball/heade
 include/postgresql/server/snowball/libstemmer/
 include/postgresql/server/snowball/libstemmer/api.h
 include/postgresql/server/snowball/libstemmer/header.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_basque.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_catalan.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h
@@ -681,6 +703,9 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
 include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_arabic.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_armenian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_basque.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_catalan.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
@@ -688,6 +713,7 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_greek.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_hindi.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_indonesian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_irish.h
@@ -699,10 +725,12 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_serbian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_tamil.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_yiddish.h
 include/postgresql/server/statistics/
 include/postgresql/server/statistics/extended_stats_internal.h
 include/postgresql/server/statistics/statistics.h
@@ -787,6 +815,8 @@ include/postgresql/server/utils/array.h
 include/postgresql/server/utils/arrayaccess.h
 include/postgresql/server/utils/ascii.h
 include/postgresql/server/utils/attoptcache.h
+include/postgresql/server/utils/backend_progress.h
+include/postgresql/server/utils/backend_status.h
 include/postgresql/server/utils/builtins.h
 include/postgresql/server/utils/bytea.h
 include/postgresql/server/utils/cash.h
@@ -825,7 +855,9 @@ include/postgresql/server/utils/logtape.
 include/postgresql/server/utils/lsyscache.h
 include/postgresql/server/utils/memdebug.h
 include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/multirangetypes.h
 include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/old_snapshot.h
 include/postgresql/server/utils/palloc.h
 include/postgresql/server/utils/partcache.h
 include/postgresql/server/utils/pg_crc.h
@@ -838,6 +870,7 @@ include/postgresql/server/utils/portal.h
 include/postgresql/server/utils/probes.h
 include/postgresql/server/utils/ps_status.h
 include/postgresql/server/utils/queryenvironment.h
+include/postgresql/server/utils/queryjumble.h
 include/postgresql/server/utils/rangetypes.h
 include/postgresql/server/utils/regproc.h
 include/postgresql/server/utils/rel.h
@@ -867,6 +900,7 @@ include/postgresql/server/utils/tzparser
 include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/varlena.h
+include/postgresql/server/utils/wait_event.h
 include/postgresql/server/utils/xid8.h
 include/postgresql/server/utils/xml.h
 include/postgresql/server/windowapi.h
@@ -887,6 +921,9 @@ include/postgresql/server/windowapi.h
 lib/postgresql/pgxs/src/pl/
 lib/postgresql/pgxs/src/pl/plpython/
 lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
+lib/postgresql/pgxs/src/test/isolation/
+@bin lib/postgresql/pgxs/src/test/isolation/isolationtester
+@bin lib/postgresql/pgxs/src/test/isolation/pg_isolation_regress
 @so lib/postgresql/plperl.so
 @so lib/postgresql/plpgsql.so
 @so lib/postgresql/test_decoding.so
@@ -932,6 +969,8 @@ share/postgresql/pg_ident.conf.sample
 share/postgresql/pg_service.conf.sample
 share/postgresql/postgres.bki
 share/postgresql/postgresql.conf.sample
+share/postgresql/system_constraints.sql
+share/postgresql/system_functions.sql
 share/postgresql/tsearch_data/
 share/postgresql/tsearch_data/danish.stop
 share/postgresql/tsearch_data/dutch.stop
Index: databases/postgresql-previous/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- databases/postgresql-previous/Makefile      10 Sep 2021 14:19:36 -0000      
1.17
+++ databases/postgresql-previous/Makefile      19 Nov 2021 21:21:34 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       PostgreSQL RDBMS (previous version, for pg_upgrade)
 
-VERSION=       12.8
+VERSION=       13.5
 DISTNAME=      postgresql-${VERSION}
 PKGNAME=       postgresql-previous-${VERSION}
 
@@ -10,7 +10,7 @@ CATEGORIES=   databases
 SHARED_LIBS=   ecpg            7.10 \
                ecpg_compat     4.10 \
                pgtypes         4.9 \
-               pq              6.11
+               pq              6.12
 
 HOMEPAGE=      https://www.postgresql.org/
 
Index: databases/postgresql-previous/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- databases/postgresql-previous/distinfo      10 Sep 2021 14:19:36 -0000      
1.8
+++ databases/postgresql-previous/distinfo      19 Nov 2021 21:21:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.8.tar.gz) = ntIagjl/Yy6fZkXRkpfODILxnGGCAfx70vgPsTHBvuI=
-SIZE (postgresql-12.8.tar.gz) = 27288408
+SHA256 (postgresql-13.5.tar.gz) = YW7Wos7NHKjvMaGHJqR3T/zsil8THsif7FYPP95F75I=
+SIZE (postgresql-13.5.tar.gz) = 27767272
Index: databases/postgresql-previous/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- databases/postgresql-previous/pkg/PLIST     12 Feb 2021 12:39:07 -0000      
1.6
+++ databases/postgresql-previous/pkg/PLIST     19 Nov 2021 21:21:34 -0000
@@ -26,6 +26,7 @@ bin/${POSTGRESQL_DIR}/
 @bin bin/${POSTGRESQL_DIR}/pg_test_fsync
 @bin bin/${POSTGRESQL_DIR}/pg_test_timing
 @bin bin/${POSTGRESQL_DIR}/pg_upgrade
+@bin bin/${POSTGRESQL_DIR}/pg_verifybackup
 @bin bin/${POSTGRESQL_DIR}/pg_waldump
 @bin bin/${POSTGRESQL_DIR}/pgbench
 @bin bin/${POSTGRESQL_DIR}/postgres
@@ -72,6 +73,7 @@ include/${POSTGRESQL_DIR}/server/
 include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/amapi.h
 include/${POSTGRESQL_DIR}/server/access/amvalidate.h
+include/${POSTGRESQL_DIR}/server/access/attmap.h
 include/${POSTGRESQL_DIR}/server/access/attnum.h
 include/${POSTGRESQL_DIR}/server/access/brin.h
 include/${POSTGRESQL_DIR}/server/access/brin_internal.h
@@ -83,6 +85,7 @@ include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/bufmask.h
 include/${POSTGRESQL_DIR}/server/access/clog.h
 include/${POSTGRESQL_DIR}/server/access/commit_ts.h
+include/${POSTGRESQL_DIR}/server/access/detoast.h
 include/${POSTGRESQL_DIR}/server/access/genam.h
 include/${POSTGRESQL_DIR}/server/access/generic_xlog.h
 include/${POSTGRESQL_DIR}/server/access/gin.h
@@ -97,6 +100,7 @@ include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/hash_xlog.h
 include/${POSTGRESQL_DIR}/server/access/heapam.h
 include/${POSTGRESQL_DIR}/server/access/heapam_xlog.h
+include/${POSTGRESQL_DIR}/server/access/heaptoast.h
 include/${POSTGRESQL_DIR}/server/access/hio.h
 include/${POSTGRESQL_DIR}/server/access/htup.h
 include/${POSTGRESQL_DIR}/server/access/htup_details.h
@@ -126,20 +130,23 @@ include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/table.h
 include/${POSTGRESQL_DIR}/server/access/tableam.h
 include/${POSTGRESQL_DIR}/server/access/timeline.h
+include/${POSTGRESQL_DIR}/server/access/toast_helper.h
+include/${POSTGRESQL_DIR}/server/access/toast_internals.h
 include/${POSTGRESQL_DIR}/server/access/transam.h
 include/${POSTGRESQL_DIR}/server/access/tsmapi.h
 include/${POSTGRESQL_DIR}/server/access/tupconvert.h
 include/${POSTGRESQL_DIR}/server/access/tupdesc.h
 include/${POSTGRESQL_DIR}/server/access/tupdesc_details.h
 include/${POSTGRESQL_DIR}/server/access/tupmacs.h
-include/${POSTGRESQL_DIR}/server/access/tuptoaster.h
 include/${POSTGRESQL_DIR}/server/access/twophase.h
 include/${POSTGRESQL_DIR}/server/access/twophase_rmgr.h
 include/${POSTGRESQL_DIR}/server/access/valid.h
 include/${POSTGRESQL_DIR}/server/access/visibilitymap.h
+include/${POSTGRESQL_DIR}/server/access/visibilitymapdefs.h
 include/${POSTGRESQL_DIR}/server/access/xact.h
 include/${POSTGRESQL_DIR}/server/access/xlog.h
 include/${POSTGRESQL_DIR}/server/access/xlog_internal.h
+include/${POSTGRESQL_DIR}/server/access/xlogarchive.h
 include/${POSTGRESQL_DIR}/server/access/xlogdefs.h
 include/${POSTGRESQL_DIR}/server/access/xloginsert.h
 include/${POSTGRESQL_DIR}/server/access/xlogreader.h
@@ -233,8 +240,6 @@ include/${POSTGRESQL_DIR}/server/catalog
 include/${POSTGRESQL_DIR}/server/catalog/pg_opfamily_d.h
 include/${POSTGRESQL_DIR}/server/catalog/pg_partitioned_table.h
 include/${POSTGRESQL_DIR}/server/catalog/pg_partitioned_table_d.h
-include/${POSTGRESQL_DIR}/server/catalog/pg_pltemplate.h
-include/${POSTGRESQL_DIR}/server/catalog/pg_pltemplate_d.h
 include/${POSTGRESQL_DIR}/server/catalog/pg_policy.h
 include/${POSTGRESQL_DIR}/server/catalog/pg_policy_d.h
 include/${POSTGRESQL_DIR}/server/catalog/pg_proc.h
@@ -330,21 +335,26 @@ include/${POSTGRESQL_DIR}/server/command
 include/${POSTGRESQL_DIR}/server/commands/variable.h
 include/${POSTGRESQL_DIR}/server/commands/view.h
 include/${POSTGRESQL_DIR}/server/common/
+include/${POSTGRESQL_DIR}/server/common/archive.h
 include/${POSTGRESQL_DIR}/server/common/base64.h
+include/${POSTGRESQL_DIR}/server/common/checksum_helper.h
 include/${POSTGRESQL_DIR}/server/common/config_info.h
 include/${POSTGRESQL_DIR}/server/common/connect.h
 include/${POSTGRESQL_DIR}/server/common/controldata_utils.h
 include/${POSTGRESQL_DIR}/server/common/fe_memutils.h
 include/${POSTGRESQL_DIR}/server/common/file_perm.h
 include/${POSTGRESQL_DIR}/server/common/file_utils.h
+include/${POSTGRESQL_DIR}/server/common/hashfn.h
 include/${POSTGRESQL_DIR}/server/common/int.h
 include/${POSTGRESQL_DIR}/server/common/int128.h
 include/${POSTGRESQL_DIR}/server/common/ip.h
+include/${POSTGRESQL_DIR}/server/common/jsonapi.h
 include/${POSTGRESQL_DIR}/server/common/keywords.h
 include/${POSTGRESQL_DIR}/server/common/kwlookup.h
 include/${POSTGRESQL_DIR}/server/common/link-canary.h
 include/${POSTGRESQL_DIR}/server/common/logging.h
 include/${POSTGRESQL_DIR}/server/common/md5.h
+include/${POSTGRESQL_DIR}/server/common/openssl.h
 include/${POSTGRESQL_DIR}/server/common/pg_lzcompress.h
 include/${POSTGRESQL_DIR}/server/common/relpath.h
 include/${POSTGRESQL_DIR}/server/common/restricted_token.h
@@ -353,8 +363,10 @@ include/${POSTGRESQL_DIR}/server/common/
 include/${POSTGRESQL_DIR}/server/common/sha2.h
 include/${POSTGRESQL_DIR}/server/common/shortest_dec.h
 include/${POSTGRESQL_DIR}/server/common/string.h
+include/${POSTGRESQL_DIR}/server/common/unicode_combining_table.h
 include/${POSTGRESQL_DIR}/server/common/unicode_norm.h
 include/${POSTGRESQL_DIR}/server/common/unicode_norm_table.h
+include/${POSTGRESQL_DIR}/server/common/unicode_normprops_table.h
 include/${POSTGRESQL_DIR}/server/common/username.h
 include/${POSTGRESQL_DIR}/server/datatype/
 include/${POSTGRESQL_DIR}/server/datatype/timestamp.h
@@ -383,6 +395,7 @@ include/${POSTGRESQL_DIR}/server/executo
 include/${POSTGRESQL_DIR}/server/executor/nodeGroup.h
 include/${POSTGRESQL_DIR}/server/executor/nodeHash.h
 include/${POSTGRESQL_DIR}/server/executor/nodeHashjoin.h
+include/${POSTGRESQL_DIR}/server/executor/nodeIncrementalSort.h
 include/${POSTGRESQL_DIR}/server/executor/nodeIndexonlyscan.h
 include/${POSTGRESQL_DIR}/server/executor/nodeIndexscan.h
 include/${POSTGRESQL_DIR}/server/executor/nodeLimit.h
@@ -426,12 +439,14 @@ include/${POSTGRESQL_DIR}/server/extensi
 include/${POSTGRESQL_DIR}/server/extension/seg/
 include/${POSTGRESQL_DIR}/server/extension/seg/segdata.h
 include/${POSTGRESQL_DIR}/server/fe_utils/
+include/${POSTGRESQL_DIR}/server/fe_utils/archive.h
+include/${POSTGRESQL_DIR}/server/fe_utils/cancel.h
 include/${POSTGRESQL_DIR}/server/fe_utils/conditional.h
-include/${POSTGRESQL_DIR}/server/fe_utils/connect.h
 include/${POSTGRESQL_DIR}/server/fe_utils/mbprint.h
 include/${POSTGRESQL_DIR}/server/fe_utils/print.h
 include/${POSTGRESQL_DIR}/server/fe_utils/psqlscan.h
 include/${POSTGRESQL_DIR}/server/fe_utils/psqlscan_int.h
+include/${POSTGRESQL_DIR}/server/fe_utils/recovery_gen.h
 include/${POSTGRESQL_DIR}/server/fe_utils/simple_list.h
 include/${POSTGRESQL_DIR}/server/fe_utils/string_utils.h
 include/${POSTGRESQL_DIR}/server/fmgr.h
@@ -455,6 +470,7 @@ include/${POSTGRESQL_DIR}/server/lib/ili
 include/${POSTGRESQL_DIR}/server/lib/integerset.h
 include/${POSTGRESQL_DIR}/server/lib/knapsack.h
 include/${POSTGRESQL_DIR}/server/lib/pairingheap.h
+include/${POSTGRESQL_DIR}/server/lib/qunique.h
 include/${POSTGRESQL_DIR}/server/lib/rbtree.h
 include/${POSTGRESQL_DIR}/server/lib/simplehash.h
 include/${POSTGRESQL_DIR}/server/lib/stringinfo.h
@@ -475,6 +491,7 @@ include/${POSTGRESQL_DIR}/server/libpq/p
 include/${POSTGRESQL_DIR}/server/libpq/scram.h
 include/${POSTGRESQL_DIR}/server/mb/
 include/${POSTGRESQL_DIR}/server/mb/pg_wchar.h
+include/${POSTGRESQL_DIR}/server/mb/stringinfo_mb.h
 include/${POSTGRESQL_DIR}/server/miscadmin.h
 include/${POSTGRESQL_DIR}/server/nodes/
 include/${POSTGRESQL_DIR}/server/nodes/bitmapset.h
@@ -581,7 +598,6 @@ include/${POSTGRESQL_DIR}/server/port/at
 include/${POSTGRESQL_DIR}/server/port/atomics/generic-gcc.h
 include/${POSTGRESQL_DIR}/server/port/atomics/generic-msvc.h
 include/${POSTGRESQL_DIR}/server/port/atomics/generic-sunpro.h
-include/${POSTGRESQL_DIR}/server/port/atomics/generic-xlc.h
 include/${POSTGRESQL_DIR}/server/port/atomics/generic.h
 include/${POSTGRESQL_DIR}/server/port/cygwin.h
 include/${POSTGRESQL_DIR}/server/port/darwin.h
@@ -628,6 +644,7 @@ include/${POSTGRESQL_DIR}/server/postmas
 include/${POSTGRESQL_DIR}/server/postmaster/bgworker_internals.h
 include/${POSTGRESQL_DIR}/server/postmaster/bgwriter.h
 include/${POSTGRESQL_DIR}/server/postmaster/fork_process.h
+include/${POSTGRESQL_DIR}/server/postmaster/interrupt.h
 include/${POSTGRESQL_DIR}/server/postmaster/pgarch.h
 include/${POSTGRESQL_DIR}/server/postmaster/postmaster.h
 include/${POSTGRESQL_DIR}/server/postmaster/startup.h
@@ -641,10 +658,10 @@ include/${POSTGRESQL_DIR}/server/regex/r
 include/${POSTGRESQL_DIR}/server/regex/regexport.h
 include/${POSTGRESQL_DIR}/server/regex/regguts.h
 include/${POSTGRESQL_DIR}/server/replication/
+include/${POSTGRESQL_DIR}/server/replication/backup_manifest.h
 include/${POSTGRESQL_DIR}/server/replication/basebackup.h
 include/${POSTGRESQL_DIR}/server/replication/decode.h
 include/${POSTGRESQL_DIR}/server/replication/logical.h
-include/${POSTGRESQL_DIR}/server/replication/logicalfuncs.h
 include/${POSTGRESQL_DIR}/server/replication/logicallauncher.h
 include/${POSTGRESQL_DIR}/server/replication/logicalproto.h
 include/${POSTGRESQL_DIR}/server/replication/logicalrelation.h
@@ -699,6 +716,7 @@ include/${POSTGRESQL_DIR}/server/snowbal
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_finnish.h
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_french.h
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_german.h
+include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_greek.h
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_hungarian.h
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_indonesian.h
 include/${POSTGRESQL_DIR}/server/snowball/libstemmer/stem_UTF_8_irish.h
@@ -774,6 +792,8 @@ include/${POSTGRESQL_DIR}/server/storage
 include/${POSTGRESQL_DIR}/server/storage/standbydefs.h
 include/${POSTGRESQL_DIR}/server/storage/sync.h
 include/${POSTGRESQL_DIR}/server/tcop/
+include/${POSTGRESQL_DIR}/server/tcop/cmdtag.h
+include/${POSTGRESQL_DIR}/server/tcop/cmdtaglist.h
 include/${POSTGRESQL_DIR}/server/tcop/deparse_utility.h
 include/${POSTGRESQL_DIR}/server/tcop/dest.h
 include/${POSTGRESQL_DIR}/server/tcop/fastpath.h
@@ -820,7 +840,6 @@ include/${POSTGRESQL_DIR}/server/utils/f
 include/${POSTGRESQL_DIR}/server/utils/geo_decls.h
 include/${POSTGRESQL_DIR}/server/utils/guc.h
 include/${POSTGRESQL_DIR}/server/utils/guc_tables.h
-include/${POSTGRESQL_DIR}/server/utils/hashutils.h
 include/${POSTGRESQL_DIR}/server/utils/help_config.h
 include/${POSTGRESQL_DIR}/server/utils/hsearch.h
 include/${POSTGRESQL_DIR}/server/utils/index_selfuncs.h
@@ -828,8 +847,8 @@ include/${POSTGRESQL_DIR}/server/utils/i
 include/${POSTGRESQL_DIR}/server/utils/int8.h
 include/${POSTGRESQL_DIR}/server/utils/inval.h
 include/${POSTGRESQL_DIR}/server/utils/json.h
-include/${POSTGRESQL_DIR}/server/utils/jsonapi.h
 include/${POSTGRESQL_DIR}/server/utils/jsonb.h
+include/${POSTGRESQL_DIR}/server/utils/jsonfuncs.h
 include/${POSTGRESQL_DIR}/server/utils/jsonpath.h
 include/${POSTGRESQL_DIR}/server/utils/logtape.h
 include/${POSTGRESQL_DIR}/server/utils/lsyscache.h
@@ -877,6 +896,7 @@ include/${POSTGRESQL_DIR}/server/utils/t
 include/${POSTGRESQL_DIR}/server/utils/uuid.h
 include/${POSTGRESQL_DIR}/server/utils/varbit.h
 include/${POSTGRESQL_DIR}/server/utils/varlena.h
+include/${POSTGRESQL_DIR}/server/utils/xid8.h
 include/${POSTGRESQL_DIR}/server/utils/xml.h
 include/${POSTGRESQL_DIR}/server/windowapi.h
 include/${POSTGRESQL_DIR}/sql3types.h
@@ -888,11 +908,11 @@ lib/${POSTGRESQL_DIR}/
 @so lib/${POSTGRESQL_DIR}/_int.so
 @so lib/${POSTGRESQL_DIR}/adminpack.so
 @so lib/${POSTGRESQL_DIR}/amcheck.so
-@so lib/${POSTGRESQL_DIR}/ascii_and_mic.so
 @so lib/${POSTGRESQL_DIR}/auth_delay.so
 @so lib/${POSTGRESQL_DIR}/auto_explain.so
 @so lib/${POSTGRESQL_DIR}/autoinc.so
 @so lib/${POSTGRESQL_DIR}/bloom.so
+@so lib/${POSTGRESQL_DIR}/bool_plperl.so
 @so lib/${POSTGRESQL_DIR}/btree_gin.so
 @so lib/${POSTGRESQL_DIR}/btree_gist.so
 @so lib/${POSTGRESQL_DIR}/citext.so
@@ -986,7 +1006,6 @@ lib/${POSTGRESQL_DIR}/pkgconfig/libpq.pc
 @so lib/${POSTGRESQL_DIR}/tsm_system_rows.so
 @so lib/${POSTGRESQL_DIR}/tsm_system_time.so
 @so lib/${POSTGRESQL_DIR}/unaccent.so
-@so lib/${POSTGRESQL_DIR}/utf8_and_ascii.so
 @so lib/${POSTGRESQL_DIR}/utf8_and_big5.so
 @so lib/${POSTGRESQL_DIR}/utf8_and_cyrillic.so
 @so lib/${POSTGRESQL_DIR}/utf8_and_euc2004.so
@@ -1010,21 +1029,24 @@ share/${POSTGRESQL_DIR}/extension/
 share/${POSTGRESQL_DIR}/extension/adminpack--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/adminpack--1.0.sql
 share/${POSTGRESQL_DIR}/extension/adminpack--1.1--2.0.sql
+share/${POSTGRESQL_DIR}/extension/adminpack--2.0--2.1.sql
 share/${POSTGRESQL_DIR}/extension/adminpack.control
 share/${POSTGRESQL_DIR}/extension/amcheck--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/amcheck--1.0.sql
 share/${POSTGRESQL_DIR}/extension/amcheck--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/amcheck.control
 share/${POSTGRESQL_DIR}/extension/autoinc--1.0.sql
-share/${POSTGRESQL_DIR}/extension/autoinc--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/autoinc.control
 share/${POSTGRESQL_DIR}/extension/bloom--1.0.sql
 share/${POSTGRESQL_DIR}/extension/bloom.control
+share/${POSTGRESQL_DIR}/extension/bool_plperl--1.0.sql
+share/${POSTGRESQL_DIR}/extension/bool_plperl.control
+share/${POSTGRESQL_DIR}/extension/bool_plperlu--1.0.sql
+share/${POSTGRESQL_DIR}/extension/bool_plperlu.control
 share/${POSTGRESQL_DIR}/extension/btree_gin--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/btree_gin--1.0.sql
 share/${POSTGRESQL_DIR}/extension/btree_gin--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/btree_gin--1.2--1.3.sql
-share/${POSTGRESQL_DIR}/extension/btree_gin--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/btree_gin.control
 share/${POSTGRESQL_DIR}/extension/btree_gist--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/btree_gist--1.1--1.2.sql
@@ -1032,7 +1054,6 @@ share/${POSTGRESQL_DIR}/extension/btree_
 share/${POSTGRESQL_DIR}/extension/btree_gist--1.2.sql
 share/${POSTGRESQL_DIR}/extension/btree_gist--1.3--1.4.sql
 share/${POSTGRESQL_DIR}/extension/btree_gist--1.4--1.5.sql
-share/${POSTGRESQL_DIR}/extension/btree_gist--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/btree_gist.control
 share/${POSTGRESQL_DIR}/extension/citext--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/citext--1.1--1.2.sql
@@ -1041,35 +1062,28 @@ share/${POSTGRESQL_DIR}/extension/citext
 share/${POSTGRESQL_DIR}/extension/citext--1.4--1.5.sql
 share/${POSTGRESQL_DIR}/extension/citext--1.4.sql
 share/${POSTGRESQL_DIR}/extension/citext--1.5--1.6.sql
-share/${POSTGRESQL_DIR}/extension/citext--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/citext.control
 share/${POSTGRESQL_DIR}/extension/cube--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/cube--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/cube--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/cube--1.2.sql
 share/${POSTGRESQL_DIR}/extension/cube--1.3--1.4.sql
-share/${POSTGRESQL_DIR}/extension/cube--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/cube.control
 share/${POSTGRESQL_DIR}/extension/dblink--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/dblink--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/dblink--1.2.sql
-share/${POSTGRESQL_DIR}/extension/dblink--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/dblink.control
 share/${POSTGRESQL_DIR}/extension/dict_int--1.0.sql
-share/${POSTGRESQL_DIR}/extension/dict_int--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/dict_int.control
 share/${POSTGRESQL_DIR}/extension/dict_xsyn--1.0.sql
-share/${POSTGRESQL_DIR}/extension/dict_xsyn--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/dict_xsyn.control
 share/${POSTGRESQL_DIR}/extension/earthdistance--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/earthdistance--1.1.sql
-share/${POSTGRESQL_DIR}/extension/earthdistance--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/earthdistance.control
 share/${POSTGRESQL_DIR}/extension/file_fdw--1.0.sql
 share/${POSTGRESQL_DIR}/extension/file_fdw.control
 share/${POSTGRESQL_DIR}/extension/fuzzystrmatch--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/fuzzystrmatch--1.1.sql
-share/${POSTGRESQL_DIR}/extension/fuzzystrmatch--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/fuzzystrmatch.control
 share/${POSTGRESQL_DIR}/extension/hstore--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/hstore--1.1--1.2.sql
@@ -1078,28 +1092,25 @@ share/${POSTGRESQL_DIR}/extension/hstore
 share/${POSTGRESQL_DIR}/extension/hstore--1.4--1.5.sql
 share/${POSTGRESQL_DIR}/extension/hstore--1.4.sql
 share/${POSTGRESQL_DIR}/extension/hstore--1.5--1.6.sql
-share/${POSTGRESQL_DIR}/extension/hstore--unpackaged--1.0.sql
+share/${POSTGRESQL_DIR}/extension/hstore--1.6--1.7.sql
 share/${POSTGRESQL_DIR}/extension/hstore.control
 share/${POSTGRESQL_DIR}/extension/hstore_plperl--1.0.sql
 share/${POSTGRESQL_DIR}/extension/hstore_plperl.control
 share/${POSTGRESQL_DIR}/extension/hstore_plperlu--1.0.sql
 share/${POSTGRESQL_DIR}/extension/hstore_plperlu.control
 share/${POSTGRESQL_DIR}/extension/insert_username--1.0.sql
-share/${POSTGRESQL_DIR}/extension/insert_username--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/insert_username.control
 share/${POSTGRESQL_DIR}/extension/intagg--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/intagg--1.1.sql
-share/${POSTGRESQL_DIR}/extension/intagg--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/intagg.control
 share/${POSTGRESQL_DIR}/extension/intarray--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/intarray--1.1--1.2.sql
+share/${POSTGRESQL_DIR}/extension/intarray--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/intarray--1.2.sql
-share/${POSTGRESQL_DIR}/extension/intarray--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/intarray.control
 share/${POSTGRESQL_DIR}/extension/isn--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/isn--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/isn--1.1.sql
-share/${POSTGRESQL_DIR}/extension/isn--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/isn.control
 share/${POSTGRESQL_DIR}/extension/jsonb_plperl--1.0.sql
 share/${POSTGRESQL_DIR}/extension/jsonb_plperl.control
@@ -1107,14 +1118,12 @@ share/${POSTGRESQL_DIR}/extension/jsonb_
 share/${POSTGRESQL_DIR}/extension/jsonb_plperlu.control
 share/${POSTGRESQL_DIR}/extension/lo--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/lo--1.1.sql
-share/${POSTGRESQL_DIR}/extension/lo--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/lo.control
 share/${POSTGRESQL_DIR}/extension/ltree--1.0--1.1.sql
+share/${POSTGRESQL_DIR}/extension/ltree--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/ltree--1.1.sql
-share/${POSTGRESQL_DIR}/extension/ltree--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/ltree.control
 share/${POSTGRESQL_DIR}/extension/moddatetime--1.0.sql
-share/${POSTGRESQL_DIR}/extension/moddatetime--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/moddatetime.control
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.1--1.2.sql
@@ -1124,18 +1133,16 @@ share/${POSTGRESQL_DIR}/extension/pagein
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.5--1.6.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.5.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.6--1.7.sql
-share/${POSTGRESQL_DIR}/extension/pageinspect--unpackaged--1.0.sql
+share/${POSTGRESQL_DIR}/extension/pageinspect--1.7--1.8.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect.control
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.2.sql
-share/${POSTGRESQL_DIR}/extension/pg_buffercache--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache.control
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap--1.1.sql
-share/${POSTGRESQL_DIR}/extension/pg_freespacemap--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap.control
 share/${POSTGRESQL_DIR}/extension/pg_prewarm--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_prewarm--1.1--1.2.sql
@@ -1149,14 +1156,14 @@ share/${POSTGRESQL_DIR}/extension/pg_sta
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.4.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.5--1.6.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.6--1.7.sql
-share/${POSTGRESQL_DIR}/extension/pg_stat_statements--unpackaged--1.0.sql
+share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.7--1.8.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements.control
 share/${POSTGRESQL_DIR}/extension/pg_trgm--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_trgm--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pg_trgm--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/pg_trgm--1.3--1.4.sql
 share/${POSTGRESQL_DIR}/extension/pg_trgm--1.3.sql
-share/${POSTGRESQL_DIR}/extension/pg_trgm--unpackaged--1.0.sql
+share/${POSTGRESQL_DIR}/extension/pg_trgm--1.4--1.5.sql
 share/${POSTGRESQL_DIR}/extension/pg_trgm.control
 share/${POSTGRESQL_DIR}/extension/pg_visibility--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_visibility--1.1--1.2.sql
@@ -1166,12 +1173,10 @@ share/${POSTGRESQL_DIR}/extension/pgcryp
 share/${POSTGRESQL_DIR}/extension/pgcrypto--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pgcrypto--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/pgcrypto--1.3.sql
-share/${POSTGRESQL_DIR}/extension/pgcrypto--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/pgcrypto.control
 share/${POSTGRESQL_DIR}/extension/pgrowlocks--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pgrowlocks--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pgrowlocks--1.2.sql
-share/${POSTGRESQL_DIR}/extension/pgrowlocks--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/pgrowlocks.control
 share/${POSTGRESQL_DIR}/extension/pgstattuple--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pgstattuple--1.1--1.2.sql
@@ -1179,35 +1184,27 @@ share/${POSTGRESQL_DIR}/extension/pgstat
 share/${POSTGRESQL_DIR}/extension/pgstattuple--1.3--1.4.sql
 share/${POSTGRESQL_DIR}/extension/pgstattuple--1.4--1.5.sql
 share/${POSTGRESQL_DIR}/extension/pgstattuple--1.4.sql
-share/${POSTGRESQL_DIR}/extension/pgstattuple--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/pgstattuple.control
 share/${POSTGRESQL_DIR}/extension/plperl--1.0.sql
-share/${POSTGRESQL_DIR}/extension/plperl--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/plperl.control
 share/${POSTGRESQL_DIR}/extension/plperlu--1.0.sql
-share/${POSTGRESQL_DIR}/extension/plperlu--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/plperlu.control
 share/${POSTGRESQL_DIR}/extension/plpgsql--1.0.sql
-share/${POSTGRESQL_DIR}/extension/plpgsql--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/plpgsql.control
 share/${POSTGRESQL_DIR}/extension/postgres_fdw--1.0.sql
 share/${POSTGRESQL_DIR}/extension/postgres_fdw.control
 share/${POSTGRESQL_DIR}/extension/refint--1.0.sql
-share/${POSTGRESQL_DIR}/extension/refint--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/refint.control
 share/${POSTGRESQL_DIR}/extension/seg--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/seg--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/seg--1.1.sql
 share/${POSTGRESQL_DIR}/extension/seg--1.2--1.3.sql
-share/${POSTGRESQL_DIR}/extension/seg--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/seg.control
 share/${POSTGRESQL_DIR}/extension/sslinfo--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/sslinfo--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/sslinfo--1.2.sql
-share/${POSTGRESQL_DIR}/extension/sslinfo--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/sslinfo.control
 share/${POSTGRESQL_DIR}/extension/tablefunc--1.0.sql
-share/${POSTGRESQL_DIR}/extension/tablefunc--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/tablefunc.control
 share/${POSTGRESQL_DIR}/extension/tcn--1.0.sql
 share/${POSTGRESQL_DIR}/extension/tcn.control
@@ -1217,23 +1214,18 @@ share/${POSTGRESQL_DIR}/extension/tsm_sy
 share/${POSTGRESQL_DIR}/extension/tsm_system_time.control
 share/${POSTGRESQL_DIR}/extension/unaccent--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/unaccent--1.1.sql
-share/${POSTGRESQL_DIR}/extension/unaccent--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/unaccent.control
 share/${POSTGRESQL_DIR}/extension/uuid-ossp--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/uuid-ossp--1.1.sql
-share/${POSTGRESQL_DIR}/extension/uuid-ossp--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/uuid-ossp.control
 share/${POSTGRESQL_DIR}/extension/xml2--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/xml2--1.1.sql
-share/${POSTGRESQL_DIR}/extension/xml2--unpackaged--1.0.sql
 share/${POSTGRESQL_DIR}/extension/xml2.control
 share/${POSTGRESQL_DIR}/information_schema.sql
 share/${POSTGRESQL_DIR}/pg_hba.conf.sample
 share/${POSTGRESQL_DIR}/pg_ident.conf.sample
 share/${POSTGRESQL_DIR}/pg_service.conf.sample
 share/${POSTGRESQL_DIR}/postgres.bki
-share/${POSTGRESQL_DIR}/postgres.description
-share/${POSTGRESQL_DIR}/postgres.shdescription
 share/${POSTGRESQL_DIR}/postgresql.conf.sample
 share/${POSTGRESQL_DIR}/psqlrc.sample
 share/${POSTGRESQL_DIR}/snowball_create.sql
Index: databases/citus/Makefile
===================================================================
RCS file: /cvs/ports/databases/citus/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- databases/citus/Makefile    21 Feb 2021 17:26:46 -0000      1.10
+++ databases/citus/Makefile    19 Nov 2021 21:21:34 -0000
@@ -4,7 +4,7 @@ COMMENT =               extension to horizontally sca
 
 GH_ACCOUNT =           citusdata
 GH_PROJECT =           citus
-GH_TAGNAME =           v9.5.4
+GH_TAGNAME =           v10.2.1
 
 CATEGORIES =           databases
 HOMEPAGE =             https://www.citusdata.com/
@@ -20,6 +20,6 @@ RUN_DEPENDS =         databases/postgresql,-ser
 
 USE_GMAKE =            Yes
 CONFIGURE_STYLE =      gnu
-CONFIGURE_ARGS =       --without-libcurl
+CONFIGURE_ARGS =       --without-libcurl --without-lz4 --without-zstd
 
 .include <bsd.port.mk>
Index: databases/citus/distinfo
===================================================================
RCS file: /cvs/ports/databases/citus/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- databases/citus/distinfo    21 Feb 2021 17:26:46 -0000      1.8
+++ databases/citus/distinfo    19 Nov 2021 21:21:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (citus-9.5.4.tar.gz) = 6pmWXAjVv8YuxO7JNReRO+4mWWM7mYlZSBBRE1Ki8b4=
-SIZE (citus-9.5.4.tar.gz) = 4718209
+SHA256 (citus-10.2.1.tar.gz) = d7GA2h7e6hWhbyG30GluuiSQxbADGobDKJxNgAYhKLk=
+SIZE (citus-10.2.1.tar.gz) = 5502245
Index: 
databases/citus/patches/patch-src_backend_distributed_commands_multi_copy_c
===================================================================
RCS file: 
databases/citus/patches/patch-src_backend_distributed_commands_multi_copy_c
diff -N 
databases/citus/patches/patch-src_backend_distributed_commands_multi_copy_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/citus/patches/patch-src_backend_distributed_commands_multi_copy_c 
19 Nov 2021 21:21:34 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix missing S_IRUSR and S_IWUSR constants.
+
+Index: src/backend/distributed/commands/multi_copy.c
+--- src/backend/distributed/commands/multi_copy.c.orig
++++ src/backend/distributed/commands/multi_copy.c
+@@ -55,6 +55,7 @@
+ #include <arpa/inet.h> /* for htons */
+ #include <netinet/in.h> /* for htons */
+ #include <string.h>
++#include <sys/stat.h>
+ 
+ #include "distributed/pg_version_constants.h"
+ 
Index: databases/citus/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/citus/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- databases/citus/pkg/PLIST   9 Feb 2021 20:02:39 -0000       1.5
+++ databases/citus/pkg/PLIST   19 Nov 2021 21:21:34 -0000
@@ -38,6 +38,7 @@ include/postgresql/server/distributed/in
 include/postgresql/server/distributed/intermediate_result_pruning.h
 include/postgresql/server/distributed/intermediate_results.h
 include/postgresql/server/distributed/listutils.h
+include/postgresql/server/distributed/local_distributed_join_planner.h
 include/postgresql/server/distributed/local_executor.h
 include/postgresql/server/distributed/local_multi_copy.h
 include/postgresql/server/distributed/local_plan_cache.h
@@ -81,13 +82,17 @@ include/postgresql/server/distributed/re
 include/postgresql/server/distributed/reference_table_utils.h
 include/postgresql/server/distributed/relation_access_tracking.h
 include/postgresql/server/distributed/relation_restriction_equivalence.h
+include/postgresql/server/distributed/relation_utils.h
 include/postgresql/server/distributed/relay_utility.h
 include/postgresql/server/distributed/remote_commands.h
 include/postgresql/server/distributed/remote_transaction.h
+include/postgresql/server/distributed/repair_shards.h
 include/postgresql/server/distributed/repartition_join_execution.h
 include/postgresql/server/distributed/resource_lock.h
 include/postgresql/server/distributed/run_from_same_connection.h
+include/postgresql/server/distributed/shard_cleaner.h
 include/postgresql/server/distributed/shard_pruning.h
+include/postgresql/server/distributed/shard_rebalancer.h
 include/postgresql/server/distributed/shard_utils.h
 include/postgresql/server/distributed/shardinterval_utils.h
 include/postgresql/server/distributed/shared_connection_stats.h
@@ -112,43 +117,14 @@ include/postgresql/server/distributed/wo
 include/postgresql/server/distributed/worker_shard_visibility.h
 include/postgresql/server/distributed/worker_transaction.h
 @so lib/postgresql/citus.so
-share/postgresql/extension/citus--7.0-1--7.0-2.sql
-share/postgresql/extension/citus--7.0-1.sql
-share/postgresql/extension/citus--7.0-10--7.0-11.sql
-share/postgresql/extension/citus--7.0-11--7.0-12.sql
-share/postgresql/extension/citus--7.0-12--7.0-13.sql
-share/postgresql/extension/citus--7.0-13--7.0-14.sql
-share/postgresql/extension/citus--7.0-14--7.0-15.sql
-share/postgresql/extension/citus--7.0-15--7.1-1.sql
-share/postgresql/extension/citus--7.0-2--7.0-3.sql
-share/postgresql/extension/citus--7.0-3--7.0-4.sql
-share/postgresql/extension/citus--7.0-4--7.0-5.sql
-share/postgresql/extension/citus--7.0-5--7.0-6.sql
-share/postgresql/extension/citus--7.0-6--7.0-7.sql
-share/postgresql/extension/citus--7.0-7--7.0-8.sql
-share/postgresql/extension/citus--7.0-8--7.0-9.sql
-share/postgresql/extension/citus--7.0-9--7.0-10.sql
-share/postgresql/extension/citus--7.1-1--7.1-2.sql
-share/postgresql/extension/citus--7.1-2--7.1-3.sql
-share/postgresql/extension/citus--7.1-3--7.1-4.sql
-share/postgresql/extension/citus--7.1-4--7.2-1.sql
-share/postgresql/extension/citus--7.2-1--7.2-2.sql
-share/postgresql/extension/citus--7.2-2--7.2-3.sql
-share/postgresql/extension/citus--7.2-3--7.3-1.sql
-share/postgresql/extension/citus--7.3-1--7.3-2.sql
-share/postgresql/extension/citus--7.3-2--7.3-3.sql
-share/postgresql/extension/citus--7.3-3--7.4-1.sql
-share/postgresql/extension/citus--7.4-1--7.4-2.sql
-share/postgresql/extension/citus--7.4-2--7.4-3.sql
-share/postgresql/extension/citus--7.4-3--7.5-1.sql
-share/postgresql/extension/citus--7.5-1--7.5-2.sql
-share/postgresql/extension/citus--7.5-2--7.5-3.sql
-share/postgresql/extension/citus--7.5-3--7.5-4.sql
-share/postgresql/extension/citus--7.5-4--7.5-5.sql
-share/postgresql/extension/citus--7.5-5--7.5-6.sql
-share/postgresql/extension/citus--7.5-6--7.5-7.sql
-share/postgresql/extension/citus--7.5-7--8.0-1.sql
+share/postgresql/extension/citus--10.0-1--10.0-2.sql
+share/postgresql/extension/citus--10.0-2--10.0-3.sql
+share/postgresql/extension/citus--10.0-3--10.0-4.sql
+share/postgresql/extension/citus--10.0-4--10.1-1.sql
+share/postgresql/extension/citus--10.1-1--10.2-1.sql
+share/postgresql/extension/citus--10.2-1--10.2-2.sql
 share/postgresql/extension/citus--8.0-1--8.0-2.sql
+share/postgresql/extension/citus--8.0-1.sql
 share/postgresql/extension/citus--8.0-10--8.0-11.sql
 share/postgresql/extension/citus--8.0-11--8.0-12.sql
 share/postgresql/extension/citus--8.0-12--8.0-13.sql
@@ -175,5 +151,14 @@ share/postgresql/extension/citus--9.2-2-
 share/postgresql/extension/citus--9.2-4--9.3-2.sql
 share/postgresql/extension/citus--9.3-1--9.2-4.sql
 share/postgresql/extension/citus--9.3-2--9.4-1.sql
+share/postgresql/extension/citus--9.4-1--9.4-2.sql
 share/postgresql/extension/citus--9.4-1--9.5-1.sql
+share/postgresql/extension/citus--9.4-2--9.4-1.sql
+share/postgresql/extension/citus--9.4-2--9.4-3.sql
+share/postgresql/extension/citus--9.4-3--9.4-2.sql
+share/postgresql/extension/citus--9.5-1--10.0-4.sql
+share/postgresql/extension/citus--9.5-1--9.5-2.sql
+share/postgresql/extension/citus--9.5-2--9.5-1.sql
+share/postgresql/extension/citus--9.5-2--9.5-3.sql
+share/postgresql/extension/citus--9.5-3--9.5-2.sql
 share/postgresql/extension/citus.control
Index: databases/pgadmin3/patches/patch-pgadmin_db_keywords_c
===================================================================
RCS file: databases/pgadmin3/patches/patch-pgadmin_db_keywords_c
diff -N databases/pgadmin3/patches/patch-pgadmin_db_keywords_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pgadmin3/patches/patch-pgadmin_db_keywords_c      19 Nov 2021 
21:21:34 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Work with PostgreSQL 14.
+
+Index: pgadmin/db/keywords.c
+--- pgadmin/db/keywords.c.orig
++++ pgadmin/db/keywords.c
+@@ -28,7 +28,7 @@
+ /*
+  * List of (keyword-name, keyword-token-value) pairs.
+  */
+-#define PG_KEYWORD(a,b,c) {a,c},
++#define PG_KEYWORD(a,b,c,d) {a,c},
+ const ScanKeyword ScanKeywords[] = {
+ #include <parser/kwlist.h>
+ };
Index: databases/postgresql-pllua/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-pllua/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/postgresql-pllua/Makefile 12 Oct 2021 18:50:17 -0000      1.18
+++ databases/postgresql-pllua/Makefile 19 Nov 2021 21:21:34 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =              Lua procedural language support for PostgreSQL
 
-VERSION =              2.0.7
+VERSION =              2.0.10
 GH_ACCOUNT =           pllua
 GH_PROJECT =           pllua
 GH_TAGNAME =           REL_${VERSION:S/./_/g}
@@ -23,8 +23,8 @@ MODULES =             lang/lua
 MODLUA_VERSION =       5.3
 
 BUILD_DEPENDS =                ${RUN_DEPENDS} \
-                       postgresql-client->=13,<14:databases/postgresql,-main
-RUN_DEPENDS =          postgresql-server->=13,<14:databases/postgresql,-server
+                       postgresql-client->=14,<15:databases/postgresql,-main
+RUN_DEPENDS =          postgresql-server->=14,<15:databases/postgresql,-server
 
 USE_GMAKE =            Yes
 
Index: databases/postgresql-pllua/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql-pllua/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- databases/postgresql-pllua/distinfo 12 Oct 2021 18:50:17 -0000      1.7
+++ databases/postgresql-pllua/distinfo 19 Nov 2021 21:21:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (pllua-REL_2_0_7.tar.gz) = /7B/Q9s7uGbXTVogC9RZ4gXb9qfRNRRJBncD43KlOv8=
-SIZE (pllua-REL_2_0_7.tar.gz) = 216196
+SHA256 (pllua-REL_2_0_10.tar.gz) = XUN5S210YOmNCEGUD/ChukHFRfzfstVx3WwsTpqRJNw=
+SIZE (pllua-REL_2_0_10.tar.gz) = 220676
Index: databases/postgresql-pllua/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-pllua/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- databases/postgresql-pllua/patches/patch-Makefile   6 Feb 2020 00:36:47 
-0000       1.3
+++ databases/postgresql-pllua/patches/patch-Makefile   19 Nov 2021 21:21:34 
-0000
@@ -14,7 +14,7 @@ Index: Makefile
  LUAC ?= luac53
  LUA ?= lua53
  
-@@ -37,7 +37,7 @@ OBJCOPY ?= objcopy
+@@ -42,7 +42,7 @@ OBJCOPY ?= objcopy
  # GNU LD and compatible linkers (including recent clang lld) should be
  # fine with -r -b binary, but this does break on some ports.
  
Index: databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c
===================================================================
RCS file: 
/cvs/ports/databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-sql_pgq_triggers_stringutil_c
--- databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c      6 Feb 
2020 00:40:06 -0000       1.2
+++ databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c      19 Nov 
2021 21:21:34 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-sql_pgq_triggers_stringu
 Fix build on PostgreSQL 9.6, patch taken from
 https://github.com/markokr/skytools/pull/56
 
-More fixes for PostgreSQL 12.
+More fixes for PostgreSQL 12 and 14.
 
 Index: sql/pgq/triggers/stringutil.c
 --- sql/pgq/triggers/stringutil.c.orig
@@ -45,7 +45,7 @@ Index: sql/pgq/triggers/stringutil.c
 -
 -      /* found anything? */
 -      return kw != NULL;
-+#define PG_KEYWORD(kwname, id, value) if(strcasecmp(kwname, ident) == 0) 
return true;
++#define PG_KEYWORD(kwname, id, value, x) if(strcasecmp(kwname, ident) == 0) 
return true;
 +#include <parser/kwlist.h>
 +#undef PG_KEYWORD
 +      return false;
Index: databases/timescaledb/Makefile
===================================================================
RCS file: /cvs/ports/databases/timescaledb/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- databases/timescaledb/Makefile      16 Oct 2021 20:43:41 -0000      1.9
+++ databases/timescaledb/Makefile      19 Nov 2021 21:21:34 -0000
@@ -4,7 +4,7 @@ COMMENT =       database designed to make SQL 
 
 GH_ACCOUNT =   timescale
 GH_PROJECT =   timescaledb
-GH_TAGNAME =   2.4.2
+GH_TAGNAME =   2.5.0
 
 CATEGORIES =   databases
 HOMEPAGE =     https://www.timescale.com/
Index: databases/timescaledb/distinfo
===================================================================
RCS file: /cvs/ports/databases/timescaledb/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- databases/timescaledb/distinfo      16 Oct 2021 20:43:41 -0000      1.8
+++ databases/timescaledb/distinfo      19 Nov 2021 21:21:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (timescaledb-2.4.2.tar.gz) = 
sgajdiUSWet0Xu6BnnqFOz+6udyEQzA3FEhKD++JoqQ=
-SIZE (timescaledb-2.4.2.tar.gz) = 2409324
+SHA256 (timescaledb-2.5.0.tar.gz) = 
nWf+cKoBzqX+zrCErcAeyooILYR/kX5o4HOrZ+SXr3Y=
+SIZE (timescaledb-2.5.0.tar.gz) = 2737786
Index: databases/timescaledb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/timescaledb/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- databases/timescaledb/pkg/PLIST     16 Oct 2021 20:43:41 -0000      1.8
+++ databases/timescaledb/pkg/PLIST     19 Nov 2021 21:21:34 -0000
@@ -23,5 +23,6 @@ share/postgresql/extension/timescaledb--
 share/postgresql/extension/timescaledb--2.3.1--${GH_TAGNAME}.sql
 share/postgresql/extension/timescaledb--2.4.0--${GH_TAGNAME}.sql
 share/postgresql/extension/timescaledb--2.4.1--${GH_TAGNAME}.sql
+share/postgresql/extension/timescaledb--2.4.2--${GH_TAGNAME}.sql
 share/postgresql/extension/timescaledb--${GH_TAGNAME}.sql
 share/postgresql/extension/timescaledb.control
Index: databases/pg_statsinfo/Makefile
===================================================================
RCS file: /cvs/ports/databases/pg_statsinfo/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- databases/pg_statsinfo/Makefile     6 Feb 2020 00:37:35 -0000       1.14
+++ databases/pg_statsinfo/Makefile     11 Oct 2021 16:20:16 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      monitor PostgreSQL activity & statistics
 
-DISTNAME =     pg_statsinfo-11.0
+DISTNAME =     pg_statsinfo-13.0
 CATEGORIES =   databases
 
 HOMEPAGE =     http://pgstatsinfo.sourceforge.net/
Index: databases/pg_statsinfo/distinfo
===================================================================
RCS file: /cvs/ports/databases/pg_statsinfo/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- databases/pg_statsinfo/distinfo     6 Feb 2020 00:37:35 -0000       1.5
+++ databases/pg_statsinfo/distinfo     11 Oct 2021 16:20:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (pg_statsinfo-11.0.tar.gz) = 
xB5KDSSKYtvpKcG2HAXqTQFiksLiL6WEU8hSveAaTvg=
-SIZE (pg_statsinfo-11.0.tar.gz) = 922044
+SHA256 (pg_statsinfo-13.0.tar.gz) = 
jUSZfPcrA61f9qO0nXM37LnzvpYjjZFzmmz52giYDi8=
+SIZE (pg_statsinfo-13.0.tar.gz) = 930497
Index: databases/pg_statsinfo/patches/patch-agent_bin_maintenance_c
===================================================================
RCS file: databases/pg_statsinfo/patches/patch-agent_bin_maintenance_c
diff -N databases/pg_statsinfo/patches/patch-agent_bin_maintenance_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pg_statsinfo/patches/patch-agent_bin_maintenance_c        11 Oct 
2021 17:30:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: agent/bin/maintenance.c
+--- agent/bin/maintenance.c.orig
++++ agent/bin/maintenance.c
+@@ -88,7 +88,7 @@ maintenance_log(const char *command, int *fd_err)
+                                       /* %l: log directory */
+                                       sp++;
+                                       if (is_absolute_path(log_directory))
+-                                              StrNCpy(dp, log_directory, endp 
- dp);
++                                              strncpy(dp, log_directory, endp 
- dp);
+                                       else
+                                               join_path_components(dp, 
data_directory, log_directory);
+                                       dp += strlen(dp);
Index: databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_c
===================================================================
RCS file: databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_c
diff -N databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_c  11 Oct 2021 
22:29:30 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Work with PostgreSQL 14.
+
+Index: agent/bin/pgut/pgut.c
+--- agent/bin/pgut/pgut.c.orig
++++ agent/bin/pgut/pgut.c
+@@ -9,6 +9,7 @@
+ 
+ #include "postgres_fe.h"
+ #include "libpq/pqsignal.h"
++#include "postgresql/server/common/string.h"
+ 
+ #include <limits.h>
+ #include <sys/stat.h>
+@@ -391,8 +392,7 @@ prompt_for_password(void)
+ #if PG_VERSION_NUM >= 100000
+       char    *password;
+ 
+-      password = pgut_malloc(100);
+-      simple_prompt("Password: ", password, 100, false);
++      password = simple_prompt("Password: ", false);
+       return password;
+ #else
+       return simple_prompt("Password: ", 100, false);
+@@ -807,7 +807,7 @@ elog(int elevel, const char *fmt, ...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->msg, fmt, args);
++              ok = appendStringInfoVA_(&edata->msg, fmt, args);
+               va_end(args);
+       } while (!ok);
+       len = strlen(fmt);
+@@ -972,7 +972,7 @@ errmsg(const char *fmt,...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->msg, fmt, args);
++              ok = appendStringInfoVA_(&edata->msg, fmt, args);
+               va_end(args);
+       } while (!ok);
+       len = strlen(fmt);
+@@ -993,7 +993,7 @@ errdetail(const char *fmt,...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->detail, fmt, args);
++              ok = appendStringInfoVA_(&edata->detail, fmt, args);
+               va_end(args);
+       } while (!ok);
+       trimStringBuffer(&edata->detail);
+@@ -1179,7 +1179,7 @@ exit_or_abort(int exitcode)
+  * unlike the server code, this function automatically extend the buffer.
+  */
+ bool
+-appendStringInfoVA(StringInfo str, const char *fmt, va_list args)
++appendStringInfoVA_(StringInfo str, const char *fmt, va_list args)
+ {
+       size_t          avail;
+       int                     nprinted;
Index: databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_h
===================================================================
RCS file: databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_h
diff -N databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pg_statsinfo/patches/patch-agent_bin_pgut_pgut_h  11 Oct 2021 
17:28:56 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix conflict when using PostgreSQL 14.
+
+Index: agent/bin/pgut/pgut.h
+--- agent/bin/pgut/pgut.h.orig
++++ agent/bin/pgut/pgut.h
+@@ -151,7 +151,7 @@ extern void CHECK_FOR_INTERRUPTS(void);
+ #define appendStringInfoChar  appendPQExpBufferChar
+ #define appendBinaryStringInfo        appendBinaryPQExpBuffer
+ 
+-extern bool appendStringInfoVA(StringInfo str, const char *fmt, va_list args)
++extern bool appendStringInfoVA_(StringInfo str, const char *fmt, va_list args)
+ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)));
+ extern int appendStringInfoFile(StringInfo str, FILE *fp);
+ extern int appendStringInfoFd(StringInfo str, int fd);
Index: databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c
===================================================================
RCS file: 
/cvs/ports/databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-agent_lib_last_xact_activity_c
--- databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c 6 Feb 
2020 00:39:37 -0000       1.5
+++ databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c 11 Oct 
2021 22:32:42 -0000
@@ -1,16 +1,56 @@
-$OpenBSD: patch-agent_lib_last_xact_activity_c,v 1.5 2020/02/06 00:39:37 
jeremy Exp $
+$OpenBSD$
 
-Work with PostgreSQL 12.
+Work with PostgreSQL 14.
 
 Index: agent/lib/last_xact_activity.c
 --- agent/lib/last_xact_activity.c.orig
 +++ agent/lib/last_xact_activity.c
-@@ -527,7 +527,7 @@ statsinfo_last_xact_activity(PG_FUNCTION_ARGS)
- 
-               oldcontext = 
MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
- 
--              tupdesc = CreateTemplateTupleDesc(LAST_XACT_ACTIVITY_COLS, 
false);
-+              tupdesc = CreateTemplateTupleDesc(LAST_XACT_ACTIVITY_COLS);
-               TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pid",
-                                                  INT4OID, -1, 0);
-               TupleDescInitEntry(tupdesc, (AttrNumber) 2, "xid",
+@@ -99,7 +99,7 @@ static Size buffer_size(int nbackends);
+ #if PG_VERSION_NUM >= 90000
+ static void myProcessUtility0(Node *parsetree, const char *queryString);
+ #if PG_VERSION_NUM >= 130000
+-static void myProcessUtility(PlannedStmt *pstmt, const char *queryString,
++static void myProcessUtility(PlannedStmt *pstmt, const char *queryString, 
bool readOnlyTree,
+                          ProcessUtilityContext context, ParamListInfo params,
+                          QueryEnvironment *queryEnv,
+                          DestReceiver *dest, QueryCompletion *qc);
+@@ -290,7 +290,7 @@ myExecutorStart(QueryDesc *queryDesc, int eflags)
+       if (!(entry->inxact && entry->pid != MyProc->pid))
+       {
+ #if PG_VERSION_NUM >= 90200
+-              entry->xid = ProcGlobal->allPgXact[MyProc->pgprocno].xid;
++              entry->xid = MyProc->xid;
+ #else
+               entry->xid = MyProc->xid;
+ #endif
+@@ -422,7 +422,7 @@ myProcessUtility0(Node *parsetree, const char *querySt
+  */
+ #if PG_VERSION_NUM >= 130000
+ static void
+-myProcessUtility(PlannedStmt *pstmt, const char *queryString,
++myProcessUtility(PlannedStmt *pstmt, const char *queryString, bool 
readOnlyTree,
+                                ProcessUtilityContext context, ParamListInfo 
params,
+                                QueryEnvironment *queryEnv,
+                                DestReceiver *dest, QueryCompletion *qc)
+@@ -435,10 +435,10 @@ myProcessUtility(PlannedStmt *pstmt, const char *query
+       PG_TRY();
+       {
+               if (prev_ProcessUtility_hook)
+-                      prev_ProcessUtility_hook(pstmt, queryString, context, 
params,
++                      prev_ProcessUtility_hook(pstmt, queryString, true, 
context, params,
+                                                                        
queryEnv, dest, qc);
+               else
+-                      standard_ProcessUtility(pstmt, queryString, context, 
params,
++                      standard_ProcessUtility(pstmt, queryString, true, 
context, params,
+                                                                       
queryEnv, dest, qc);
+       }
+       PG_CATCH();
+@@ -855,7 +855,7 @@ init_entry(int beid, Oid userid)
+       {
+               entry->pid = MyProc->pid;
+ #if PG_VERSION_NUM >= 90200
+-              entry->xid = ProcGlobal->allPgXact[MyProc->pgprocno].xid;
++              entry->xid = MyProc->xid;
+ #else
+               entry->xid = MyProc->xid;
+ #endif
Index: databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c
===================================================================
RCS file: 
/cvs/ports/databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-agent_lib_libstatsinfo_c
--- databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c       6 Feb 
2020 19:26:34 -0000       1.7
+++ databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c       11 Oct 
2021 22:25:39 -0000
@@ -1,11 +1,11 @@
 $OpenBSD: patch-agent_lib_libstatsinfo_c,v 1.7 2020/02/06 19:26:34 jeremy Exp $
 
-Work with PostgreSQL 12.
+Work with PostgreSQL 14.
 
 Index: agent/lib/libstatsinfo.c
 --- agent/lib/libstatsinfo.c.orig
 +++ agent/lib/libstatsinfo.c
-@@ -7,6 +7,7 @@
+@@ -7,10 +7,10 @@
  #include "libstatsinfo.h"
  
  #include <fcntl.h>
@@ -13,11 +13,14 @@ Index: agent/lib/libstatsinfo.c
  #include <unistd.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -34,9 +35,10 @@
+-#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <float.h>
+@@ -35,8 +35,10 @@
  #include "storage/procarray.h"
  #include "utils/builtins.h"
  #include "utils/guc.h"
--#include "utils/tqual.h"
 +#include "utils/snapmgr.h"
  #include "utils/lsyscache.h"
  #include "utils/ps_status.h"
@@ -25,7 +28,7 @@ Index: agent/lib/libstatsinfo.c
  
  #if PG_VERSION_NUM >= 90100
  #include "catalog/pg_collation.h"
-@@ -595,6 +597,7 @@ sample_activity(void)
+@@ -608,6 +610,7 @@ sample_activity(void)
        int                     waiting = 0;
        int                     running = 0;
        int                     i;
@@ -33,7 +36,16 @@ Index: agent/lib/libstatsinfo.c
  
        if (!long_xacts)
        {
-@@ -1887,9 +1890,11 @@ statsinfo_restart(PG_FUNCTION_ARGS)
+@@ -696,7 +699,7 @@ sample_activity(void)
+               /* XXX: needs lock? */
+ #if PG_VERSION_NUM >= 90200
+               if ((proc = BackendPidGetProc(be->st_procpid)) == NULL ||
+-                      (ProcGlobal->allPgXact[proc->pgprocno].vacuumFlags & 
PROC_IN_VACUUM))
++                      (ProcGlobal->statusFlags[proc->pgxactoff] & 
PROC_IN_VACUUM))
+                       continue;
+ #else
+               if ((proc = BackendPidGetProc(be->st_procpid)) == NULL ||
+@@ -1903,9 +1906,11 @@ statsinfo_restart(PG_FUNCTION_ARGS)
  #define NUM_STAT_FIELDS_MIN           6
  
  /* not support a kernel that does not have the required fields at 
"/proc/stat" */
@@ -45,7 +57,7 @@ Index: agent/lib/libstatsinfo.c
  
  /*
   * statsinfo_cpustats - get cpu information
-@@ -1928,6 +1933,7 @@ statsinfo_cpustats_noarg(PG_FUNCTION_ARGS)
+@@ -1944,6 +1949,7 @@ statsinfo_cpustats_noarg(PG_FUNCTION_ARGS)
        PG_RETURN_DATUM(get_cpustats(fcinfo, 0, 0, 0, 0));
  }
  
@@ -53,7 +65,7 @@ Index: agent/lib/libstatsinfo.c
  static Datum
  get_cpustats(FunctionCallInfo fcinfo,
                         int64 prev_cpu_user,
-@@ -1940,6 +1946,59 @@ get_cpustats(FunctionCallInfo fcinfo,
+@@ -1956,6 +1962,59 @@ get_cpustats(FunctionCallInfo fcinfo,
        int64                    cpu_system;
        int64                    cpu_idle;
        int64                    cpu_iowait;
@@ -113,7 +125,7 @@ Index: agent/lib/libstatsinfo.c
        List                    *records = NIL;
        List                    *fields = NIL;
        HeapTuple                tuple;
-@@ -2012,6 +2071,7 @@ get_cpustats(FunctionCallInfo fcinfo,
+@@ -2028,6 +2087,7 @@ get_cpustats(FunctionCallInfo fcinfo,
  
        return HeapTupleGetDatum(tuple);
  }
@@ -121,7 +133,7 @@ Index: agent/lib/libstatsinfo.c
  
  #define NUM_DEVICESTATS_COLS                  17
  #define TYPE_DEVICE_TABLESPACES                       TEXTOID
-@@ -2185,10 +2245,46 @@ statsinfo_devicestats(PG_FUNCTION_ARGS)
+@@ -2201,10 +2261,46 @@ statsinfo_devicestats(PG_FUNCTION_ARGS)
  /*
   * statsinfo_loadavg - get loadavg information
   */
@@ -168,7 +180,7 @@ Index: agent/lib/libstatsinfo.c
        int                     fd;
        char            buffer[256];
        int                     nbytes;
-@@ -2247,6 +2343,7 @@ statsinfo_loadavg(PG_FUNCTION_ARGS)
+@@ -2263,6 +2359,7 @@ statsinfo_loadavg(PG_FUNCTION_ARGS)
  
        return HeapTupleGetDatum(tuple);
  }
@@ -176,7 +188,7 @@ Index: agent/lib/libstatsinfo.c
  
  #define FILE_MEMINFO          "/proc/meminfo"
  #define NUM_MEMORY_COLS               5
-@@ -2266,6 +2363,7 @@ compare_meminfo_table(const void *a, const void *b)
+@@ -2282,6 +2379,7 @@ compare_meminfo_table(const void *a, const void *b)
  /*
   * statsinfo_memory - get memory information
   */
@@ -184,7 +196,7 @@ Index: agent/lib/libstatsinfo.c
  Datum
  statsinfo_memory(PG_FUNCTION_ARGS)
  {
-@@ -2273,6 +2371,36 @@ statsinfo_memory(PG_FUNCTION_ARGS)
+@@ -2289,6 +2387,36 @@ statsinfo_memory(PG_FUNCTION_ARGS)
        HeapTuple                tuple;
        Datum                    values[NUM_MEMORY_COLS];
        bool                     nulls[NUM_MEMORY_COLS];
@@ -221,7 +233,7 @@ Index: agent/lib/libstatsinfo.c
        int                              fd;
        char                     buffer[2048];
        int                              nbytes;
-@@ -2371,6 +2499,7 @@ nextline:
+@@ -2387,6 +2515,7 @@ nextline:
  
        return HeapTupleGetDatum(tuple);
  }
@@ -229,7 +241,7 @@ Index: agent/lib/libstatsinfo.c
  
  #define FILE_PROFILE          "/proc/systemtap/statsinfo_prof/profile"
  #define NUM_PROFILE_COLS      3
-@@ -2379,9 +2508,16 @@ nextline:
+@@ -2395,9 +2524,16 @@ nextline:
  /*
   * statsinfo_profile - get profile information
   */
@@ -246,7 +258,7 @@ Index: agent/lib/libstatsinfo.c
        ReturnSetInfo   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
        TupleDesc                tupdesc;
        Tuplestorestate *tupstore;
-@@ -2488,6 +2624,7 @@ statsinfo_profile(PG_FUNCTION_ARGS)
+@@ -2504,6 +2640,7 @@ statsinfo_profile(PG_FUNCTION_ARGS)
  
        PG_RETURN_VOID();
  }
@@ -254,49 +266,3 @@ Index: agent/lib/libstatsinfo.c
  
  static bool
  checked_write(int fd, const void *buf, int size)
-@@ -3014,7 +3151,7 @@ statsinfo_tablespaces(PG_FUNCTION_ARGS)
-       Tuplestorestate    *tupstore;
-       MemoryContext           per_query_ctx;
-       MemoryContext           oldcontext;
--      HeapScanDesc            scan;
-+      TableScanDesc           scan;
-       HeapTuple                       tuple;
-       Relation                        relation;
-       Datum                           values[TABLESPACES_COLS];
-@@ -3053,9 +3190,9 @@ statsinfo_tablespaces(PG_FUNCTION_ARGS)
- 
-       relation = heap_open(TableSpaceRelationId, AccessShareLock);
- #if PG_VERSION_NUM >= 90400
--      scan = heap_beginscan_catalog(relation, 0, NULL);
-+      scan = table_beginscan_catalog(relation, 0, NULL);
- #else
--      scan = heap_beginscan(relation, SnapshotNow, 0, NULL);
-+      scan = table_beginscan(relation, SnapshotNow, 0, NULL);
- #endif
-       while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-       {
-@@ -3067,20 +3204,20 @@ statsinfo_tablespaces(PG_FUNCTION_ARGS)
-               i = 0;
- 
-               /* oid */
--              values[i++] = ObjectIdGetDatum(HeapTupleGetOid(tuple));
-+              values[i++] = ObjectIdGetDatum(form->oid);
- 
-               /* name */
-               values[i++] = CStringGetTextDatum(NameStr(form->spcname));
- 
-               /* location */
--              if (HeapTupleGetOid(tuple) == DEFAULTTABLESPACE_OID ||
--                      HeapTupleGetOid(tuple) == GLOBALTABLESPACE_OID)
-+              if (form->oid == DEFAULTTABLESPACE_OID ||
-+                      form->oid == GLOBALTABLESPACE_OID)
-                       datum = CStringGetTextDatum(DataDir);
-               else
-               {
- #if PG_VERSION_NUM >= 90200
-                       datum = DirectFunctionCall1(pg_tablespace_location,
--                                                                              
ObjectIdGetDatum(HeapTupleGetOid(tuple)));
-+                                                                              
ObjectIdGetDatum(form->oid));
- #else
-                       bool isnull;
-                       datum = fastgetattr(tuple, 
Anum_pg_tablespace_spclocation,
Index: databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_c
===================================================================
RCS file: databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_c
diff -N databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_c   11 Oct 2021 
22:29:33 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Work with PostgreSQL 14.
+
+Index: reporter/pgut/pgut.c
+--- reporter/pgut/pgut.c.orig
++++ reporter/pgut/pgut.c
+@@ -9,6 +9,7 @@
+ 
+ #include "postgres_fe.h"
+ #include "libpq/pqsignal.h"
++#include "postgresql/server/common/string.h"
+ 
+ #include <limits.h>
+ #include <sys/stat.h>
+@@ -390,8 +391,7 @@ prompt_for_password(void)
+ #if PG_VERSION_NUM >= 100000
+       char    *password;
+ 
+-      password = pgut_malloc(100);
+-      simple_prompt("Password: ", password, 100, false);
++      password = simple_prompt("Password: ", false);
+       return password;
+ #else
+       return simple_prompt("Password: ", 100, false);
+@@ -806,7 +806,7 @@ elog(int elevel, const char *fmt, ...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->msg, fmt, args);
++              ok = appendStringInfoVA_(&edata->msg, fmt, args);
+               va_end(args);
+       } while (!ok);
+       len = strlen(fmt);
+@@ -971,7 +971,7 @@ errmsg(const char *fmt,...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->msg, fmt, args);
++              ok = appendStringInfoVA_(&edata->msg, fmt, args);
+               va_end(args);
+       } while (!ok);
+       len = strlen(fmt);
+@@ -992,7 +992,7 @@ errdetail(const char *fmt,...)
+       do
+       {
+               va_start(args, fmt);
+-              ok = appendStringInfoVA(&edata->detail, fmt, args);
++              ok = appendStringInfoVA_(&edata->detail, fmt, args);
+               va_end(args);
+       } while (!ok);
+       trimStringBuffer(&edata->detail);
+@@ -1178,7 +1178,7 @@ exit_or_abort(int exitcode)
+  * unlike the server code, this function automatically extend the buffer.
+  */
+ bool
+-appendStringInfoVA(StringInfo str, const char *fmt, va_list args)
++appendStringInfoVA_(StringInfo str, const char *fmt, va_list args)
+ {
+       size_t          avail;
+       int                     nprinted;
Index: databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_h
===================================================================
RCS file: databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_h
diff -N databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ databases/pg_statsinfo/patches/patch-reporter_pgut_pgut_h   11 Oct 2021 
22:25:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Work with PostgreSQL 14.
+
+Index: reporter/pgut/pgut.h
+--- reporter/pgut/pgut.h.orig
++++ reporter/pgut/pgut.h
+@@ -150,7 +150,7 @@ extern void CHECK_FOR_INTERRUPTS(void);
+ #define appendStringInfoChar  appendPQExpBufferChar
+ #define appendBinaryStringInfo        appendBinaryPQExpBuffer
+ 
+-extern bool appendStringInfoVA(StringInfo str, const char *fmt, va_list args)
++extern bool appendStringInfoVA_(StringInfo str, const char *fmt, va_list args)
+ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)));
+ extern int appendStringInfoFile(StringInfo str, FILE *fp);
+ extern int appendStringInfoFd(StringInfo str, int fd);
Index: databases/pg_statsinfo/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/pg_statsinfo/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- databases/pg_statsinfo/pkg/PLIST    13 May 2016 22:09:21 -0000      1.2
+++ databases/pg_statsinfo/pkg/PLIST    11 Oct 2021 22:33:08 -0000
@@ -2,7 +2,7 @@
 bin/archive_pglog.sh
 @bin bin/pg_statsinfo
 @bin bin/pg_statsinfod
-lib/postgresql/pg_statsinfo.so
+@so lib/postgresql/pg_statsinfo.so
 share/postgresql/contrib/
 share/postgresql/contrib/pg_statsinfo.sql
 share/postgresql/contrib/pg_statsrepo.sql

Reply via email to