On 10/29 07:35, Jeremy Evans wrote: > I ran a partial bulk of the PostgreSQL dependencies, and this is what is > broke with PostgreSQL 12: > > databases/citus > databases/pg_statsinfo > databases/kdb > databases/postgresql-pllua > databases/postgresql-plv8 > databases/skytools > security/heimdal,-libs (appears unrelated, will try rebuilding) > x11/qt3,-examples
The security/heimdal failure was unrelated. I just removed postgresql-plv8. Below is a diff to update PostgreSQL to 12.0, postgresql-previous to 11.5, and handle the fallout in the other ports mentioned above. I recommend we wait until 12.1, update this patch for 12.1, then run a bulk and commit if there are no problems. We might want to consider removing skytools in the next major PostgreSQL update if it breaks, as it appears to be dead upstream. Thanks, Jeremy Index: databases/postgresql/Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.256 diff -u -p -u -p -r1.256 Makefile --- databases/postgresql/Makefile 27 Aug 2019 19:49:46 -0000 1.256 +++ databases/postgresql/Makefile 2 Nov 2019 11:22:46 -0000 @@ -7,9 +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= 11.5 -PREV_MAJOR= 10 -REVISION-server=0 +VERSION= 12.0 +PREV_MAJOR= 11 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} PKGNAME-server= postgresql-server-${VERSION} @@ -20,10 +19,10 @@ PKGNAME-pg_upgrade=postgresql-pg_upgrade CATEGORIES= databases -SHARED_LIBS= ecpg 7.9 \ - ecpg_compat 4.9 \ - pgtypes 4.8 \ - pq 6.10 +SHARED_LIBS= ecpg 7.10 \ + ecpg_compat 4.10 \ + pgtypes 4.9 \ + pq 6.11 HOMEPAGE= http://www.postgresql.org/ @@ -96,8 +95,10 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conf ALL_TARGET= world INSTALL_TARGET= install-world -LIB_DEPENDS-main= textproc/libxml -WANTLIB-main = ${WANTLIB} xml2 +LIB_DEPENDS-main= archivers/xz \ + converters/libiconv \ + textproc/libxml +WANTLIB-main = ${WANTLIB} iconv lzma xml2 LIB_DEPENDS-server= databases/postgresql=${VERSION} \ @@ -163,5 +164,7 @@ post-install: ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/postgresql perl -i -pe ${INSTALL_REPLACE} \ ${PREFIX}/lib/postgresql/pgxs/src/Makefile.global + ${INSTALL_DATA} ${WRKSRC}/src/backend/utils/errcodes.txt \ + ${PREFIX}/share/postgresql .include <bsd.port.mk> Index: databases/postgresql/distinfo =================================================================== RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.80 diff -u -p -u -p -r1.80 distinfo --- databases/postgresql/distinfo 12 Aug 2019 16:40:40 -0000 1.80 +++ databases/postgresql/distinfo 3 Oct 2019 15:13:21 -0000 @@ -1,2 +1,2 @@ -SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng= -SIZE (postgresql-11.5.tar.gz) = 25940612 +SHA256 (postgresql-12.0.tar.gz) = FcfyZ7R212THlAHX9h85x2IiMUlR935ok6WFTbJrZhY= +SIZE (postgresql-12.0.tar.gz) = 26393892 Index: databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c =================================================================== RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_bin_scripts_vacuumdb_c --- databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 13 Nov 2017 17:17:30 -0000 1.2 +++ databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 2 Oct 2019 15:53:06 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-src_bin_scripts_vacuumdb Index: src/bin/scripts/vacuumdb.c --- src/bin/scripts/vacuumdb.c.orig +++ src/bin/scripts/vacuumdb.c -@@ -10,6 +10,8 @@ - *------------------------------------------------------------------------- - */ +@@ -14,6 +14,8 @@ + #define FD_SETSIZE 1024 /* must set before winsock2.h is included */ + #endif +#include <sys/select.h> /* FD_SETSIZE */ + Index: databases/postgresql/patches/patch-src_include_storage_s_lock_h =================================================================== RCS file: /cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-src_include_storage_s_lock_h --- databases/postgresql/patches/patch-src_include_storage_s_lock_h 18 Feb 2018 17:37:13 -0000 1.5 +++ databases/postgresql/patches/patch-src_include_storage_s_lock_h 2 Oct 2019 15:53:06 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_include_storage_s_lo Index: src/include/storage/s_lock.h --- src/include/storage/s_lock.h.orig +++ src/include/storage/s_lock.h -@@ -717,6 +717,29 @@ typedef unsigned char slock_t; +@@ -734,6 +734,29 @@ typedef unsigned char slock_t; do { __asm__ __volatile__("" : : : "memory"); *(lock) = 0; } while (0) #endif Index: databases/postgresql/pkg/PLIST-contrib =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v retrieving revision 1.20 diff -u -p -u -p -r1.20 PLIST-contrib --- databases/postgresql/pkg/PLIST-contrib 19 Feb 2019 05:09:18 -0000 1.20 +++ databases/postgresql/pkg/PLIST-contrib 18 Jun 2019 16:44:02 -0000 @@ -49,7 +49,6 @@ lib/postgresql/seg.so lib/postgresql/sslinfo.so lib/postgresql/tablefunc.so lib/postgresql/tcn.so -lib/postgresql/timetravel.so lib/postgresql/tsm_system_rows.so lib/postgresql/tsm_system_time.so lib/postgresql/unaccent.so @@ -252,9 +251,6 @@ share/postgresql/extension/tablefunc--un share/postgresql/extension/tablefunc.control share/postgresql/extension/tcn--1.0.sql share/postgresql/extension/tcn.control -share/postgresql/extension/timetravel--1.0.sql -share/postgresql/extension/timetravel--unpackaged--1.0.sql -share/postgresql/extension/timetravel.control share/postgresql/extension/tsm_system_rows--1.0.sql share/postgresql/extension/tsm_system_rows.control share/postgresql/extension/tsm_system_time--1.0.sql Index: databases/postgresql/pkg/PLIST-docs =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v retrieving revision 1.92 diff -u -p -u -p -r1.92 PLIST-docs --- databases/postgresql/pkg/PLIST-docs 12 Aug 2019 16:40:40 -0000 1.92 +++ databases/postgresql/pkg/PLIST-docs 2 Nov 2019 11:40:16 -0000 @@ -10,7 +10,6 @@ share/doc/postgresql/extension/autoinc.e share/doc/postgresql/extension/insert_username.example share/doc/postgresql/extension/moddatetime.example share/doc/postgresql/extension/refint.example -share/doc/postgresql/extension/timetravel.example share/doc/postgresql/html/ share/doc/postgresql/html/acronyms.html share/doc/postgresql/html/admin.html @@ -27,6 +26,7 @@ share/doc/postgresql/html/app-pg-ctl.htm share/doc/postgresql/html/app-pg-dumpall.html share/doc/postgresql/html/app-pg-isready.html share/doc/postgresql/html/app-pgbasebackup.html +share/doc/postgresql/html/app-pgchecksums.html share/doc/postgresql/html/app-pgconfig.html share/doc/postgresql/html/app-pgcontroldata.html share/doc/postgresql/html/app-pgdump.html @@ -42,7 +42,6 @@ share/doc/postgresql/html/app-reindexdb. share/doc/postgresql/html/app-vacuumdb.html share/doc/postgresql/html/appendixes.html share/doc/postgresql/html/applevel-consistency.html -share/doc/postgresql/html/archive-recovery-settings.html share/doc/postgresql/html/arrays.html share/doc/postgresql/html/auth-bsd.html share/doc/postgresql/html/auth-cert.html @@ -130,6 +129,7 @@ share/doc/postgresql/html/catalog-pg-seq share/doc/postgresql/html/catalog-pg-shdepend.html share/doc/postgresql/html/catalog-pg-shdescription.html share/doc/postgresql/html/catalog-pg-shseclabel.html +share/doc/postgresql/html/catalog-pg-statistic-ext-data.html share/doc/postgresql/html/catalog-pg-statistic-ext.html share/doc/postgresql/html/catalog-pg-statistic.html share/doc/postgresql/html/catalog-pg-subscription-rel.html @@ -217,6 +217,7 @@ share/doc/postgresql/html/ddl-constraint share/doc/postgresql/html/ddl-default.html share/doc/postgresql/html/ddl-depend.html share/doc/postgresql/html/ddl-foreign-data.html +share/doc/postgresql/html/ddl-generated-columns.html share/doc/postgresql/html/ddl-inherit.html share/doc/postgresql/html/ddl-others.html share/doc/postgresql/html/ddl-partitioning.html @@ -334,6 +335,7 @@ share/doc/postgresql/html/functions-net. share/doc/postgresql/html/functions-range.html share/doc/postgresql/html/functions-sequence.html share/doc/postgresql/html/functions-srf.html +share/doc/postgresql/html/functions-statistics.html share/doc/postgresql/html/functions-string.html share/doc/postgresql/html/functions-subquery.html share/doc/postgresql/html/functions-textsearch.html @@ -356,6 +358,7 @@ share/doc/postgresql/html/gin-intro.html share/doc/postgresql/html/gin-limit.html share/doc/postgresql/html/gin-tips.html share/doc/postgresql/html/gin.html +share/doc/postgresql/html/gin.svg share/doc/postgresql/html/gist-builtin-opclasses.html share/doc/postgresql/html/gist-examples.html share/doc/postgresql/html/gist-extensibility.html @@ -364,6 +367,7 @@ share/doc/postgresql/html/gist-intro.htm share/doc/postgresql/html/gist.html share/doc/postgresql/html/git.html share/doc/postgresql/html/gssapi-auth.html +share/doc/postgresql/html/gssapi-enc.html share/doc/postgresql/html/high-availability.html share/doc/postgresql/html/history.html share/doc/postgresql/html/hot-standby.html @@ -399,6 +403,7 @@ share/doc/postgresql/html/infoschema-che share/doc/postgresql/html/infoschema-check-constraints.html share/doc/postgresql/html/infoschema-collation-character-set-applicab.html share/doc/postgresql/html/infoschema-collations.html +share/doc/postgresql/html/infoschema-column-column-usage.html share/doc/postgresql/html/infoschema-column-domain-usage.html share/doc/postgresql/html/infoschema-column-options.html share/doc/postgresql/html/infoschema-column-privileges.html @@ -499,6 +504,7 @@ share/doc/postgresql/html/libpq-ssl.html share/doc/postgresql/html/libpq-status.html share/doc/postgresql/html/libpq-threading.html share/doc/postgresql/html/libpq.html +share/doc/postgresql/html/limits.html share/doc/postgresql/html/lo-examplesect.html share/doc/postgresql/html/lo-funcs.html share/doc/postgresql/html/lo-implementation.html @@ -554,6 +560,7 @@ share/doc/postgresql/html/notation.html share/doc/postgresql/html/oid2name.html share/doc/postgresql/html/overview.html share/doc/postgresql/html/pageinspect.html +share/doc/postgresql/html/pagelayout.svg share/doc/postgresql/html/parallel-plans.html share/doc/postgresql/html/parallel-query.html share/doc/postgresql/html/parallel-safety.html @@ -575,7 +582,6 @@ share/doc/postgresql/html/pgtestfsync.ht share/doc/postgresql/html/pgtesttiming.html share/doc/postgresql/html/pgtrgm.html share/doc/postgresql/html/pgupgrade.html -share/doc/postgresql/html/pgverifychecksums.html share/doc/postgresql/html/pgvisibility.html share/doc/postgresql/html/pgwaldump.html share/doc/postgresql/html/planner-optimizer.html @@ -659,8 +665,6 @@ share/doc/postgresql/html/queries.html share/doc/postgresql/html/query-path.html share/doc/postgresql/html/querytree.html share/doc/postgresql/html/rangetypes.html -share/doc/postgresql/html/recovery-config.html -share/doc/postgresql/html/recovery-target-settings.html share/doc/postgresql/html/reference-client.html share/doc/postgresql/html/reference-server.html share/doc/postgresql/html/reference.html @@ -670,12 +674,7 @@ 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-11-1.html -share/doc/postgresql/html/release-11-2.html -share/doc/postgresql/html/release-11-3.html -share/doc/postgresql/html/release-11-4.html -share/doc/postgresql/html/release-11-5.html -share/doc/postgresql/html/release-11.html +share/doc/postgresql/html/release-${V_MAJOR}.html share/doc/postgresql/html/release-prior.html share/doc/postgresql/html/release.html share/doc/postgresql/html/replication-origins.html @@ -979,7 +978,6 @@ share/doc/postgresql/html/ssh-tunnels.ht share/doc/postgresql/html/ssl-tcp.html share/doc/postgresql/html/sslinfo.html share/doc/postgresql/html/sspi-auth.html -share/doc/postgresql/html/standby-settings.html share/doc/postgresql/html/storage-file-layout.html share/doc/postgresql/html/storage-fsm.html share/doc/postgresql/html/storage-init.html @@ -991,6 +989,7 @@ share/doc/postgresql/html/stylesheet.css share/doc/postgresql/html/supported-platforms.html share/doc/postgresql/html/system-catalog-declarations.html share/doc/postgresql/html/system-catalog-initial-data.html +share/doc/postgresql/html/tableam.html share/doc/postgresql/html/tablefunc.html share/doc/postgresql/html/tablesample-method.html share/doc/postgresql/html/tablesample-support-functions.html @@ -1076,6 +1075,7 @@ share/doc/postgresql/html/view-pg-seclab share/doc/postgresql/html/view-pg-sequences.html share/doc/postgresql/html/view-pg-settings.html share/doc/postgresql/html/view-pg-shadow.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 share/doc/postgresql/html/view-pg-timezone-abbrevs.html @@ -1096,12 +1096,14 @@ share/doc/postgresql/html/when-can-paral share/doc/postgresql/html/xaggr.html share/doc/postgresql/html/xfunc-c.html share/doc/postgresql/html/xfunc-internal.html +share/doc/postgresql/html/xfunc-optimization.html share/doc/postgresql/html/xfunc-overload.html share/doc/postgresql/html/xfunc-pl.html share/doc/postgresql/html/xfunc-sql.html share/doc/postgresql/html/xfunc-volatility.html share/doc/postgresql/html/xfunc.html share/doc/postgresql/html/xindex.html +share/doc/postgresql/html/xml-limits-conformance.html share/doc/postgresql/html/xml2.html share/doc/postgresql/html/xoper-optimization.html share/doc/postgresql/html/xoper.html @@ -1109,4 +1111,3 @@ share/doc/postgresql/html/xplang-install share/doc/postgresql/html/xplang.html share/doc/postgresql/html/xproc.html share/doc/postgresql/html/xtypes.html -share/postgresql/errcodes.txt Index: databases/postgresql/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v retrieving revision 1.30 diff -u -p -u -p -r1.30 PLIST-main --- databases/postgresql/pkg/PLIST-main 19 Feb 2019 05:09:18 -0000 1.30 +++ databases/postgresql/pkg/PLIST-main 2 Nov 2019 11:23:52 -0000 @@ -64,8 +64,10 @@ lib/libecpg_compat.a @comment lib/libecpg_compat.so.4 @lib lib/libecpg_compat.so.${LIBecpg_compat_VERSION} lib/libpgcommon.a +lib/libpgcommon_shlib.a lib/libpgfeutils.a lib/libpgport.a +lib/libpgport_shlib.a lib/libpgtypes.a @comment lib/libpgtypes.so @comment lib/libpgtypes.so.4 @@ -108,6 +110,7 @@ lib/postgresql/pgxs/src/test/regress/ @man man/man1/reindexdb.1 @man man/man1/vacuumdb.1 @man man/man3/SPI_commit.3 +@man man/man3/SPI_commit_and_chain.3 @man man/man3/SPI_connect.3 @man man/man3/SPI_connect_ext.3 @man man/man3/SPI_copytuple.3 @@ -152,6 +155,7 @@ lib/postgresql/pgxs/src/test/regress/ @man man/man3/SPI_result_code_string.3 @man man/man3/SPI_returntuple.3 @man man/man3/SPI_rollback.3 +@man man/man3/SPI_rollback_and_chain.3 @man man/man3/SPI_saveplan.3 @man man/man3/SPI_scroll_cursor_fetch.3 @man man/man3/SPI_scroll_cursor_move.3 @@ -361,11 +365,10 @@ lib/postgresql/pgxs/src/test/regress/ @man man/man7/VALUES.7 @man man/man7/WITH.7 share/postgresql/ -share/postgresql/conversion_create.sql +share/postgresql/errcodes.txt share/postgresql/information_schema.sql share/postgresql/postgres.description share/postgresql/psqlrc.sample -share/postgresql/recovery.conf.sample share/postgresql/snowball_create.sql share/postgresql/sql_features.txt share/postgresql/system_views.sql Index: databases/postgresql/pkg/PLIST-server =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v retrieving revision 1.38 diff -u -p -u -p -r1.38 PLIST-server --- databases/postgresql/pkg/PLIST-server 19 Feb 2019 16:45:46 -0000 1.38 +++ databases/postgresql/pkg/PLIST-server 2 Oct 2019 16:19:19 -0000 @@ -9,6 +9,7 @@ @newuser _postgresql:503:_postgresql:daemon:PostgreSQL Manager:/var/postgresql:/bin/sh @bin bin/initdb @bin bin/pg_basebackup +@bin bin/pg_checksums @bin bin/pg_controldata @bin bin/pg_ctl @bin bin/pg_isready @@ -16,7 +17,6 @@ @bin bin/pg_recvlogical @bin bin/pg_resetwal @bin bin/pg_rewind -@bin bin/pg_verify_checksums @bin bin/pg_waldump @bin bin/postgres bin/postmaster @@ -59,6 +59,7 @@ include/postgresql/server/access/nbtxlog include/postgresql/server/access/parallel.h include/postgresql/server/access/printsimple.h include/postgresql/server/access/printtup.h +include/postgresql/server/access/relation.h include/postgresql/server/access/reloptions.h include/postgresql/server/access/relscan.h include/postgresql/server/access/rewriteheap.h @@ -74,6 +75,8 @@ include/postgresql/server/access/spgxlog include/postgresql/server/access/stratnum.h include/postgresql/server/access/subtrans.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/transam.h include/postgresql/server/access/tsmapi.h @@ -212,6 +215,8 @@ include/postgresql/server/catalog/pg_sta include/postgresql/server/catalog/pg_statistic_d.h include/postgresql/server/catalog/pg_statistic_ext.h include/postgresql/server/catalog/pg_statistic_ext_d.h +include/postgresql/server/catalog/pg_statistic_ext_data.h +include/postgresql/server/catalog/pg_statistic_ext_data_d.h include/postgresql/server/catalog/pg_subscription.h include/postgresql/server/catalog/pg_subscription_d.h include/postgresql/server/catalog/pg_subscription_rel.h @@ -287,6 +292,9 @@ include/postgresql/server/common/int.h include/postgresql/server/common/int128.h include/postgresql/server/common/ip.h include/postgresql/server/common/keywords.h +include/postgresql/server/common/kwlookup.h +include/postgresql/server/common/link-canary.h +include/postgresql/server/common/logging.h include/postgresql/server/common/md5.h include/postgresql/server/common/pg_lzcompress.h include/postgresql/server/common/relpath.h @@ -294,13 +302,13 @@ include/postgresql/server/common/restric include/postgresql/server/common/saslprep.h include/postgresql/server/common/scram-common.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_norm.h include/postgresql/server/common/unicode_norm_table.h include/postgresql/server/common/username.h include/postgresql/server/datatype/ include/postgresql/server/datatype/timestamp.h -include/postgresql/server/dynloader.h include/postgresql/server/executor/ include/postgresql/server/executor/execExpr.h include/postgresql/server/executor/execParallel.h @@ -395,6 +403,7 @@ include/postgresql/server/lib/bloomfilte include/postgresql/server/lib/dshash.h include/postgresql/server/lib/hyperloglog.h include/postgresql/server/lib/ilist.h +include/postgresql/server/lib/integerset.h include/postgresql/server/lib/knapsack.h include/postgresql/server/lib/pairingheap.h include/postgresql/server/lib/rbtree.h @@ -403,6 +412,7 @@ include/postgresql/server/lib/stringinfo include/postgresql/server/libpq/ include/postgresql/server/libpq/auth.h include/postgresql/server/libpq/be-fsstubs.h +include/postgresql/server/libpq/be-gssapi-common.h include/postgresql/server/libpq/crypt.h include/postgresql/server/libpq/hba.h include/postgresql/server/libpq/ifaddr.h @@ -428,16 +438,18 @@ include/postgresql/server/nodes/nodeFunc include/postgresql/server/nodes/nodes.h include/postgresql/server/nodes/params.h include/postgresql/server/nodes/parsenodes.h +include/postgresql/server/nodes/pathnodes.h include/postgresql/server/nodes/pg_list.h include/postgresql/server/nodes/plannodes.h include/postgresql/server/nodes/primnodes.h include/postgresql/server/nodes/print.h include/postgresql/server/nodes/readfuncs.h -include/postgresql/server/nodes/relation.h include/postgresql/server/nodes/replnodes.h +include/postgresql/server/nodes/supportnodes.h include/postgresql/server/nodes/tidbitmap.h include/postgresql/server/nodes/value.h include/postgresql/server/optimizer/ +include/postgresql/server/optimizer/appendinfo.h include/postgresql/server/optimizer/clauses.h include/postgresql/server/optimizer/cost.h include/postgresql/server/optimizer/geqo.h @@ -449,7 +461,9 @@ include/postgresql/server/optimizer/geqo include/postgresql/server/optimizer/geqo_random.h include/postgresql/server/optimizer/geqo_recombination.h include/postgresql/server/optimizer/geqo_selection.h +include/postgresql/server/optimizer/inherit.h include/postgresql/server/optimizer/joininfo.h +include/postgresql/server/optimizer/optimizer.h include/postgresql/server/optimizer/orclauses.h include/postgresql/server/optimizer/paramassign.h include/postgresql/server/optimizer/pathnode.h @@ -458,12 +472,10 @@ include/postgresql/server/optimizer/plac include/postgresql/server/optimizer/plancat.h include/postgresql/server/optimizer/planmain.h include/postgresql/server/optimizer/planner.h -include/postgresql/server/optimizer/predtest.h include/postgresql/server/optimizer/prep.h include/postgresql/server/optimizer/restrictinfo.h include/postgresql/server/optimizer/subselect.h include/postgresql/server/optimizer/tlist.h -include/postgresql/server/optimizer/var.h include/postgresql/server/parser/ include/postgresql/server/parser/analyze.h include/postgresql/server/parser/gram.h @@ -491,6 +503,7 @@ include/postgresql/server/parser/scansup include/postgresql/server/partitioning/ include/postgresql/server/partitioning/partbounds.h include/postgresql/server/partitioning/partdefs.h +include/postgresql/server/partitioning/partdesc.h include/postgresql/server/partitioning/partprune.h include/postgresql/server/pg_config.h include/postgresql/server/pg_config_ext.h @@ -539,6 +552,7 @@ include/postgresql/server/port/hpux.h include/postgresql/server/port/linux.h include/postgresql/server/port/netbsd.h 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/solaris.h @@ -629,15 +643,18 @@ include/postgresql/server/snowball/libst include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h -include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_indonesian.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_irish.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h +include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_hungarian.h 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_danish.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h @@ -645,7 +662,11 @@ 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_hungarian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_indonesian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_irish.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_lithuanian.h +include/postgresql/server/snowball/libstemmer/stem_UTF_8_nepali.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h @@ -653,6 +674,7 @@ include/postgresql/server/snowball/libst include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.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/statistics/ include/postgresql/server/statistics/extended_stats_internal.h @@ -687,6 +709,7 @@ include/postgresql/server/storage/lock.h include/postgresql/server/storage/lockdefs.h include/postgresql/server/storage/lwlock.h include/postgresql/server/storage/lwlocknames.h +include/postgresql/server/storage/md.h include/postgresql/server/storage/off.h include/postgresql/server/storage/pg_sema.h include/postgresql/server/storage/pg_shmem.h @@ -711,6 +734,7 @@ include/postgresql/server/storage/smgr.h include/postgresql/server/storage/spin.h include/postgresql/server/storage/standby.h include/postgresql/server/storage/standbydefs.h +include/postgresql/server/storage/sync.h include/postgresql/server/tcop/ include/postgresql/server/tcop/deparse_utility.h include/postgresql/server/tcop/dest.h @@ -734,7 +758,6 @@ 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_random.h include/postgresql/server/utils/builtins.h include/postgresql/server/utils/bytea.h include/postgresql/server/utils/cash.h @@ -745,12 +768,12 @@ include/postgresql/server/utils/datetime include/postgresql/server/utils/datum.h include/postgresql/server/utils/dsa.h include/postgresql/server/utils/dynahash.h -include/postgresql/server/utils/dynamic_loader.h include/postgresql/server/utils/elog.h include/postgresql/server/utils/errcodes.h include/postgresql/server/utils/evtcache.h include/postgresql/server/utils/expandeddatum.h include/postgresql/server/utils/expandedrecord.h +include/postgresql/server/utils/float.h include/postgresql/server/utils/fmgroids.h include/postgresql/server/utils/fmgrprotos.h include/postgresql/server/utils/fmgrtab.h @@ -769,11 +792,11 @@ include/postgresql/server/utils/inval.h include/postgresql/server/utils/json.h include/postgresql/server/utils/jsonapi.h include/postgresql/server/utils/jsonb.h +include/postgresql/server/utils/jsonpath.h include/postgresql/server/utils/logtape.h include/postgresql/server/utils/lsyscache.h include/postgresql/server/utils/memdebug.h include/postgresql/server/utils/memutils.h -include/postgresql/server/utils/nabstime.h include/postgresql/server/utils/numeric.h include/postgresql/server/utils/palloc.h include/postgresql/server/utils/partcache.h @@ -809,7 +832,6 @@ include/postgresql/server/utils/spccache include/postgresql/server/utils/syscache.h include/postgresql/server/utils/timeout.h include/postgresql/server/utils/timestamp.h -include/postgresql/server/utils/tqual.h include/postgresql/server/utils/tuplesort.h include/postgresql/server/utils/tuplestore.h include/postgresql/server/utils/typcache.h @@ -859,18 +881,22 @@ lib/postgresql/utf8_and_uhc.so lib/postgresql/utf8_and_win.so @man man/man1/initdb.1 @man man/man1/pg_basebackup.1 +@man man/man1/pg_checksums.1 @man man/man1/pg_controldata.1 @man man/man1/pg_ctl.1 @man man/man1/pg_receivewal.1 @man man/man1/pg_recvlogical.1 @man man/man1/pg_resetwal.1 @man man/man1/pg_rewind.1 -@man man/man1/pg_verify_checksums.1 @man man/man1/pg_waldump.1 @man man/man1/postgres.1 @man man/man1/postmaster.1 share/doc/pkg-readmes/${PKGSTEM} share/postgresql/extension/ +share/postgresql/extension/amcheck--1.1--1.2.sql +share/postgresql/extension/citext--1.5--1.6.sql +share/postgresql/extension/hstore--1.5--1.6.sql +share/postgresql/extension/pg_stat_statements--1.6--1.7.sql share/postgresql/extension/plperl--1.0.sql share/postgresql/extension/plperl--unpackaged--1.0.sql share/postgresql/extension/plperl.control @@ -902,6 +928,7 @@ share/postgresql/tsearch_data/hunspell_s share/postgresql/tsearch_data/ispell_sample.affix share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/italian.stop +share/postgresql/tsearch_data/nepali.stop share/postgresql/tsearch_data/norwegian.stop share/postgresql/tsearch_data/portuguese.stop share/postgresql/tsearch_data/russian.stop Index: databases/postgresql-previous/Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql-previous/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- databases/postgresql-previous/Makefile 12 Jul 2019 20:43:59 -0000 1.10 +++ databases/postgresql-previous/Makefile 3 Oct 2019 17:53:03 -0000 @@ -2,16 +2,15 @@ COMMENT= PostgreSQL RDBMS (previous version, for pg_upgrade) -VERSION= 10.6 +VERSION= 11.5 DISTNAME= postgresql-${VERSION} PKGNAME= postgresql-previous-${VERSION} -REVISION= 0 CATEGORIES= databases -SHARED_LIBS= ecpg 7.8 \ - ecpg_compat 4.8 \ - pgtypes 4.7 \ - pq 6.9 +SHARED_LIBS= ecpg 7.9 \ + ecpg_compat 4.9 \ + pgtypes 4.8 \ + pq 6.10 HOMEPAGE= http://www.postgresql.org/ Index: databases/postgresql-previous/distinfo =================================================================== RCS file: /cvs/ports/databases/postgresql-previous/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- databases/postgresql-previous/distinfo 19 Feb 2019 05:09:58 -0000 1.3 +++ databases/postgresql-previous/distinfo 3 Oct 2019 18:02:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (postgresql-10.6.tar.gz) = fMtwrJHZaOMvZCpPQKeIUkU1L6t+6FMO3OEn3qbmICs= -SIZE (postgresql-10.6.tar.gz) = 26902911 +SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng= +SIZE (postgresql-11.5.tar.gz) = 25940612 Index: databases/postgresql-previous/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/postgresql-previous/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- databases/postgresql-previous/pkg/PLIST 19 Feb 2019 05:09:58 -0000 1.3 +++ databases/postgresql-previous/pkg/PLIST 2 Nov 2019 11:42:15 -0000 @@ -25,6 +25,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_verify_checksums @bin bin/${POSTGRESQL_DIR}/pg_waldump @bin bin/${POSTGRESQL_DIR}/pgbench @bin bin/${POSTGRESQL_DIR}/postgres @@ -112,6 +113,7 @@ include/${POSTGRESQL_DIR}/server/access/ include/${POSTGRESQL_DIR}/server/access/rmgr.h include/${POSTGRESQL_DIR}/server/access/rmgrlist.h include/${POSTGRESQL_DIR}/server/access/sdir.h +include/${POSTGRESQL_DIR}/server/access/session.h include/${POSTGRESQL_DIR}/server/access/skey.h include/${POSTGRESQL_DIR}/server/access/slru.h include/${POSTGRESQL_DIR}/server/access/spgist.h @@ -125,6 +127,7 @@ include/${POSTGRESQL_DIR}/server/access/ 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 @@ -157,75 +160,130 @@ include/${POSTGRESQL_DIR}/server/catalog include/${POSTGRESQL_DIR}/server/catalog/opfam_internal.h include/${POSTGRESQL_DIR}/server/catalog/partition.h include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate.h +include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_am.h +include/${POSTGRESQL_DIR}/server/catalog/pg_am_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_amop.h +include/${POSTGRESQL_DIR}/server/catalog/pg_amop_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_amproc.h +include/${POSTGRESQL_DIR}/server/catalog/pg_amproc_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef.h +include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_attribute.h +include/${POSTGRESQL_DIR}/server/catalog/pg_attribute_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members.h +include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_authid.h +include/${POSTGRESQL_DIR}/server/catalog/pg_authid_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_cast.h +include/${POSTGRESQL_DIR}/server/catalog/pg_cast_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_class.h +include/${POSTGRESQL_DIR}/server/catalog/pg_class_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_collation.h -include/${POSTGRESQL_DIR}/server/catalog/pg_collation_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_collation_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_constraint.h -include/${POSTGRESQL_DIR}/server/catalog/pg_constraint_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_constraint_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_control.h include/${POSTGRESQL_DIR}/server/catalog/pg_conversion.h -include/${POSTGRESQL_DIR}/server/catalog/pg_conversion_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_conversion_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_database.h +include/${POSTGRESQL_DIR}/server/catalog/pg_database_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_db_role_setting.h +include/${POSTGRESQL_DIR}/server/catalog/pg_db_role_setting_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_default_acl.h +include/${POSTGRESQL_DIR}/server/catalog/pg_default_acl_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_depend.h +include/${POSTGRESQL_DIR}/server/catalog/pg_depend_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_description.h +include/${POSTGRESQL_DIR}/server/catalog/pg_description_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_enum.h +include/${POSTGRESQL_DIR}/server/catalog/pg_enum_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_event_trigger.h +include/${POSTGRESQL_DIR}/server/catalog/pg_event_trigger_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_extension.h +include/${POSTGRESQL_DIR}/server/catalog/pg_extension_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_data_wrapper.h +include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_data_wrapper_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_server.h +include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_server_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_table.h +include/${POSTGRESQL_DIR}/server/catalog/pg_foreign_table_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_index.h +include/${POSTGRESQL_DIR}/server/catalog/pg_index_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_inherits.h -include/${POSTGRESQL_DIR}/server/catalog/pg_inherits_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_inherits_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_init_privs.h +include/${POSTGRESQL_DIR}/server/catalog/pg_init_privs_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_language.h +include/${POSTGRESQL_DIR}/server/catalog/pg_language_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_largeobject.h +include/${POSTGRESQL_DIR}/server/catalog/pg_largeobject_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_largeobject_metadata.h +include/${POSTGRESQL_DIR}/server/catalog/pg_largeobject_metadata_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_namespace.h +include/${POSTGRESQL_DIR}/server/catalog/pg_namespace_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_opclass.h +include/${POSTGRESQL_DIR}/server/catalog/pg_opclass_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_operator.h -include/${POSTGRESQL_DIR}/server/catalog/pg_operator_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_operator_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_opfamily.h +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 -include/${POSTGRESQL_DIR}/server/catalog/pg_proc_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_proc_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_publication.h +include/${POSTGRESQL_DIR}/server/catalog/pg_publication_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_publication_rel.h +include/${POSTGRESQL_DIR}/server/catalog/pg_publication_rel_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_range.h +include/${POSTGRESQL_DIR}/server/catalog/pg_range_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_replication_origin.h +include/${POSTGRESQL_DIR}/server/catalog/pg_replication_origin_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_rewrite.h +include/${POSTGRESQL_DIR}/server/catalog/pg_rewrite_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_seclabel.h +include/${POSTGRESQL_DIR}/server/catalog/pg_seclabel_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_sequence.h +include/${POSTGRESQL_DIR}/server/catalog/pg_sequence_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_shdepend.h +include/${POSTGRESQL_DIR}/server/catalog/pg_shdepend_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_shdescription.h +include/${POSTGRESQL_DIR}/server/catalog/pg_shdescription_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_shseclabel.h +include/${POSTGRESQL_DIR}/server/catalog/pg_shseclabel_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_statistic.h +include/${POSTGRESQL_DIR}/server/catalog/pg_statistic_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_statistic_ext.h +include/${POSTGRESQL_DIR}/server/catalog/pg_statistic_ext_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_subscription.h +include/${POSTGRESQL_DIR}/server/catalog/pg_subscription_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_subscription_rel.h +include/${POSTGRESQL_DIR}/server/catalog/pg_subscription_rel_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_tablespace.h +include/${POSTGRESQL_DIR}/server/catalog/pg_tablespace_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_transform.h +include/${POSTGRESQL_DIR}/server/catalog/pg_transform_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_trigger.h +include/${POSTGRESQL_DIR}/server/catalog/pg_trigger_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_ts_config.h +include/${POSTGRESQL_DIR}/server/catalog/pg_ts_config_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_ts_config_map.h +include/${POSTGRESQL_DIR}/server/catalog/pg_ts_config_map_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_ts_dict.h +include/${POSTGRESQL_DIR}/server/catalog/pg_ts_dict_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_ts_parser.h +include/${POSTGRESQL_DIR}/server/catalog/pg_ts_parser_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_ts_template.h +include/${POSTGRESQL_DIR}/server/catalog/pg_ts_template_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_type.h -include/${POSTGRESQL_DIR}/server/catalog/pg_type_fn.h +include/${POSTGRESQL_DIR}/server/catalog/pg_type_d.h include/${POSTGRESQL_DIR}/server/catalog/pg_user_mapping.h +include/${POSTGRESQL_DIR}/server/catalog/pg_user_mapping_d.h include/${POSTGRESQL_DIR}/server/catalog/schemapg.h include/${POSTGRESQL_DIR}/server/catalog/storage.h include/${POSTGRESQL_DIR}/server/catalog/storage_xlog.h @@ -271,7 +329,9 @@ include/${POSTGRESQL_DIR}/server/common/ include/${POSTGRESQL_DIR}/server/common/config_info.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/int.h include/${POSTGRESQL_DIR}/server/common/int128.h include/${POSTGRESQL_DIR}/server/common/ip.h include/${POSTGRESQL_DIR}/server/common/keywords.h @@ -292,6 +352,7 @@ include/${POSTGRESQL_DIR}/server/dynload include/${POSTGRESQL_DIR}/server/executor/ include/${POSTGRESQL_DIR}/server/executor/execExpr.h include/${POSTGRESQL_DIR}/server/executor/execParallel.h +include/${POSTGRESQL_DIR}/server/executor/execPartition.h include/${POSTGRESQL_DIR}/server/executor/execdebug.h include/${POSTGRESQL_DIR}/server/executor/execdesc.h include/${POSTGRESQL_DIR}/server/executor/executor.h @@ -344,7 +405,19 @@ include/${POSTGRESQL_DIR}/server/executo include/${POSTGRESQL_DIR}/server/executor/tqueue.h include/${POSTGRESQL_DIR}/server/executor/tstoreReceiver.h include/${POSTGRESQL_DIR}/server/executor/tuptable.h +include/${POSTGRESQL_DIR}/server/extension/ +include/${POSTGRESQL_DIR}/server/extension/cube/ +include/${POSTGRESQL_DIR}/server/extension/cube/cubedata.h +include/${POSTGRESQL_DIR}/server/extension/hstore/ +include/${POSTGRESQL_DIR}/server/extension/hstore/hstore.h +include/${POSTGRESQL_DIR}/server/extension/isn/ +include/${POSTGRESQL_DIR}/server/extension/isn/isn.h +include/${POSTGRESQL_DIR}/server/extension/ltree/ +include/${POSTGRESQL_DIR}/server/extension/ltree/ltree.h +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/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 @@ -359,9 +432,15 @@ include/${POSTGRESQL_DIR}/server/foreign include/${POSTGRESQL_DIR}/server/funcapi.h include/${POSTGRESQL_DIR}/server/getaddrinfo.h include/${POSTGRESQL_DIR}/server/getopt_long.h +include/${POSTGRESQL_DIR}/server/jit/ +include/${POSTGRESQL_DIR}/server/jit/jit.h +include/${POSTGRESQL_DIR}/server/jit/llvmjit.h +include/${POSTGRESQL_DIR}/server/jit/llvmjit_emit.h include/${POSTGRESQL_DIR}/server/lib/ include/${POSTGRESQL_DIR}/server/lib/binaryheap.h include/${POSTGRESQL_DIR}/server/lib/bipartite_match.h +include/${POSTGRESQL_DIR}/server/lib/bloomfilter.h +include/${POSTGRESQL_DIR}/server/lib/dshash.h include/${POSTGRESQL_DIR}/server/lib/hyperloglog.h include/${POSTGRESQL_DIR}/server/lib/ilist.h include/${POSTGRESQL_DIR}/server/lib/knapsack.h @@ -420,6 +499,7 @@ include/${POSTGRESQL_DIR}/server/optimiz include/${POSTGRESQL_DIR}/server/optimizer/geqo_selection.h include/${POSTGRESQL_DIR}/server/optimizer/joininfo.h include/${POSTGRESQL_DIR}/server/optimizer/orclauses.h +include/${POSTGRESQL_DIR}/server/optimizer/paramassign.h include/${POSTGRESQL_DIR}/server/optimizer/pathnode.h include/${POSTGRESQL_DIR}/server/optimizer/paths.h include/${POSTGRESQL_DIR}/server/optimizer/placeholder.h @@ -456,6 +536,10 @@ include/${POSTGRESQL_DIR}/server/parser/ include/${POSTGRESQL_DIR}/server/parser/parsetree.h include/${POSTGRESQL_DIR}/server/parser/scanner.h include/${POSTGRESQL_DIR}/server/parser/scansup.h +include/${POSTGRESQL_DIR}/server/partitioning/ +include/${POSTGRESQL_DIR}/server/partitioning/partbounds.h +include/${POSTGRESQL_DIR}/server/partitioning/partdefs.h +include/${POSTGRESQL_DIR}/server/partitioning/partprune.h include/${POSTGRESQL_DIR}/server/pg_config.h include/${POSTGRESQL_DIR}/server/pg_config_ext.h include/${POSTGRESQL_DIR}/server/pg_config_manual.h @@ -466,6 +550,7 @@ include/${POSTGRESQL_DIR}/server/pgstat. include/${POSTGRESQL_DIR}/server/pgtar.h include/${POSTGRESQL_DIR}/server/pgtime.h include/${POSTGRESQL_DIR}/server/plperl.h +include/${POSTGRESQL_DIR}/server/plperl_helpers.h include/${POSTGRESQL_DIR}/server/plpgsql.h include/${POSTGRESQL_DIR}/server/port/ include/${POSTGRESQL_DIR}/server/port.h @@ -515,6 +600,7 @@ include/${POSTGRESQL_DIR}/server/port/wi include/${POSTGRESQL_DIR}/server/port/win32_msvc/sys/time.h include/${POSTGRESQL_DIR}/server/port/win32_msvc/unistd.h include/${POSTGRESQL_DIR}/server/port/win32_msvc/utime.h +include/${POSTGRESQL_DIR}/server/port/win32_port.h include/${POSTGRESQL_DIR}/server/portability/ include/${POSTGRESQL_DIR}/server/portability/instr_time.h include/${POSTGRESQL_DIR}/server/portability/mem.h @@ -610,6 +696,7 @@ include/${POSTGRESQL_DIR}/server/statist include/${POSTGRESQL_DIR}/server/statistics/statistics.h include/${POSTGRESQL_DIR}/server/storage/ include/${POSTGRESQL_DIR}/server/storage/backendid.h +include/${POSTGRESQL_DIR}/server/storage/barrier.h include/${POSTGRESQL_DIR}/server/storage/block.h include/${POSTGRESQL_DIR}/server/storage/buf.h include/${POSTGRESQL_DIR}/server/storage/buf_internals.h @@ -651,6 +738,7 @@ include/${POSTGRESQL_DIR}/server/storage include/${POSTGRESQL_DIR}/server/storage/reinit.h include/${POSTGRESQL_DIR}/server/storage/relfilenode.h include/${POSTGRESQL_DIR}/server/storage/s_lock.h +include/${POSTGRESQL_DIR}/server/storage/sharedfileset.h include/${POSTGRESQL_DIR}/server/storage/shm_mq.h include/${POSTGRESQL_DIR}/server/storage/shm_toc.h include/${POSTGRESQL_DIR}/server/storage/shmem.h @@ -699,6 +787,7 @@ include/${POSTGRESQL_DIR}/server/utils/e include/${POSTGRESQL_DIR}/server/utils/errcodes.h include/${POSTGRESQL_DIR}/server/utils/evtcache.h include/${POSTGRESQL_DIR}/server/utils/expandeddatum.h +include/${POSTGRESQL_DIR}/server/utils/expandedrecord.h include/${POSTGRESQL_DIR}/server/utils/fmgroids.h include/${POSTGRESQL_DIR}/server/utils/fmgrprotos.h include/${POSTGRESQL_DIR}/server/utils/fmgrtab.h @@ -724,6 +813,7 @@ include/${POSTGRESQL_DIR}/server/utils/m include/${POSTGRESQL_DIR}/server/utils/nabstime.h include/${POSTGRESQL_DIR}/server/utils/numeric.h include/${POSTGRESQL_DIR}/server/utils/palloc.h +include/${POSTGRESQL_DIR}/server/utils/partcache.h include/${POSTGRESQL_DIR}/server/utils/pg_crc.h include/${POSTGRESQL_DIR}/server/utils/pg_locale.h include/${POSTGRESQL_DIR}/server/utils/pg_lsn.h @@ -748,6 +838,7 @@ include/${POSTGRESQL_DIR}/server/utils/r include/${POSTGRESQL_DIR}/server/utils/ruleutils.h include/${POSTGRESQL_DIR}/server/utils/sampling.h include/${POSTGRESQL_DIR}/server/utils/selfuncs.h +include/${POSTGRESQL_DIR}/server/utils/sharedtuplestore.h include/${POSTGRESQL_DIR}/server/utils/snapmgr.h include/${POSTGRESQL_DIR}/server/utils/snapshot.h include/${POSTGRESQL_DIR}/server/utils/sortsupport.h @@ -781,7 +872,6 @@ lib/${POSTGRESQL_DIR}/autoinc.so lib/${POSTGRESQL_DIR}/bloom.so lib/${POSTGRESQL_DIR}/btree_gin.so lib/${POSTGRESQL_DIR}/btree_gist.so -lib/${POSTGRESQL_DIR}/chkpass.so lib/${POSTGRESQL_DIR}/citext.so lib/${POSTGRESQL_DIR}/cube.so lib/${POSTGRESQL_DIR}/cyrillic_and_mic.so @@ -801,6 +891,7 @@ lib/${POSTGRESQL_DIR}/hstore.so lib/${POSTGRESQL_DIR}/hstore_plperl.so lib/${POSTGRESQL_DIR}/insert_username.so lib/${POSTGRESQL_DIR}/isn.so +lib/${POSTGRESQL_DIR}/jsonb_plperl.so lib/${POSTGRESQL_DIR}/latin2_and_win1250.so lib/${POSTGRESQL_DIR}/latin_and_mic.so lib/${POSTGRESQL_DIR}/libecpg.a @@ -889,19 +980,15 @@ lib/${POSTGRESQL_DIR}/utf8_and_sjis2004. lib/${POSTGRESQL_DIR}/utf8_and_uhc.so lib/${POSTGRESQL_DIR}/utf8_and_win.so lib/${POSTGRESQL_DIR}/uuid-ossp.so -share/doc/postgresql/ -share/doc/postgresql/extension/ -share/doc/postgresql/extension/autoinc.example -share/doc/postgresql/extension/insert_username.example -share/doc/postgresql/extension/moddatetime.example -share/doc/postgresql/extension/refint.example -share/doc/postgresql/extension/timetravel.example share/${POSTGRESQL_DIR}/ share/${POSTGRESQL_DIR}/conversion_create.sql +share/${POSTGRESQL_DIR}/errcodes.txt 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.control +share/${POSTGRESQL_DIR}/extension/amcheck--1.0--1.1.sql share/${POSTGRESQL_DIR}/extension/amcheck--1.0.sql share/${POSTGRESQL_DIR}/extension/amcheck.control share/${POSTGRESQL_DIR}/extension/autoinc--1.0.sql @@ -912,6 +999,7 @@ share/${POSTGRESQL_DIR}/extension/bloom. 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 @@ -922,19 +1010,19 @@ share/${POSTGRESQL_DIR}/extension/btree_ 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/chkpass--1.0.sql -share/${POSTGRESQL_DIR}/extension/chkpass--unpackaged--1.0.sql -share/${POSTGRESQL_DIR}/extension/chkpass.control share/${POSTGRESQL_DIR}/extension/citext--1.0--1.1.sql share/${POSTGRESQL_DIR}/extension/citext--1.1--1.2.sql share/${POSTGRESQL_DIR}/extension/citext--1.2--1.3.sql share/${POSTGRESQL_DIR}/extension/citext--1.3--1.4.sql +share/${POSTGRESQL_DIR}/extension/citext--1.4--1.5.sql share/${POSTGRESQL_DIR}/extension/citext--1.4.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 @@ -962,6 +1050,7 @@ share/${POSTGRESQL_DIR}/extension/hstore share/${POSTGRESQL_DIR}/extension/hstore--1.1--1.2.sql share/${POSTGRESQL_DIR}/extension/hstore--1.2--1.3.sql share/${POSTGRESQL_DIR}/extension/hstore--1.3--1.4.sql +share/${POSTGRESQL_DIR}/extension/hstore--1.4--1.5.sql share/${POSTGRESQL_DIR}/extension/hstore--1.4.sql share/${POSTGRESQL_DIR}/extension/hstore--unpackaged--1.0.sql share/${POSTGRESQL_DIR}/extension/hstore.control @@ -982,9 +1071,14 @@ share/${POSTGRESQL_DIR}/extension/intarr 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 +share/${POSTGRESQL_DIR}/extension/jsonb_plperlu--1.0.sql +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 @@ -1003,6 +1097,7 @@ share/${POSTGRESQL_DIR}/extension/pagein share/${POSTGRESQL_DIR}/extension/pageinspect--1.4--1.5.sql 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.control share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.0--1.1.sql @@ -1017,6 +1112,7 @@ share/${POSTGRESQL_DIR}/extension/pg_fre 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 share/${POSTGRESQL_DIR}/extension/pg_prewarm--1.1.sql share/${POSTGRESQL_DIR}/extension/pg_prewarm.control share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.0--1.1.sql @@ -1031,6 +1127,7 @@ share/${POSTGRESQL_DIR}/extension/pg_sta 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.control @@ -1072,7 +1169,9 @@ share/${POSTGRESQL_DIR}/extension/refint 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 Index: databases/postgresql-pllua/Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql-pllua/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- databases/postgresql-pllua/Makefile 12 Jul 2019 20:43:59 -0000 1.14 +++ databases/postgresql-pllua/Makefile 5 Nov 2019 02:08:34 -0000 @@ -2,13 +2,13 @@ COMMENT = Lua procedural language support for PostgreSQL -VERSION = 1.1.0 -DISTNAME = v${VERSION} +VERSION = 2.0.4 +DISTNAME = REL_2_0_4 PKGNAME = postgresql-pllua-${VERSION} CATEGORIES = databases -HOMEPAGE = https://github.com/pllua/pllua +HOMEPAGE = https://github.com/pllua/pllua-ng MAINTAINER = Jeremy Evans <jer...@openbsd.org> @@ -17,22 +17,19 @@ PERMIT_PACKAGE = Yes WANTLIB = c ${MODLUA_WANTLIB} -MASTER_SITES = https://github.com/pllua/pllua/archive/ -MASTER_SITES0 = https://github.com/pllua/pllua/commit/ - -PATCH_DIST_STRIP = -p1 -PATCHFILES = 3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff:0 \ - 3d926a6b0117f168e7a29a18bb16110fea2957c2.diff:0 +MASTER_SITES = https://github.com/pllua/pllua-ng/archive/ MODULES = lang/lua +MODLUA_VERSION = 5.3 + BUILD_DEPENDS = ${RUN_DEPENDS} \ - postgresql-client->=11,<12:databases/postgresql,-main -RUN_DEPENDS = postgresql-server->=11,<12:databases/postgresql,-server + postgresql-client->=12,<13:databases/postgresql,-main +RUN_DEPENDS = postgresql-server->=12,<13:databases/postgresql,-server USE_GMAKE = Yes -WRKDIST = ${WRKDIR}/pllua-1.1.0 -SUBST_VARS = MODLUA_INCL_DIR MODLUA_WANTLIB +WRKDIST = ${WRKDIR}/pllua-ng-REL_2_0_4 +SUBST_VARS = MODLUA_INCL_DIR MODLUA_WANTLIB MODLUA_BIN LLD_EMUL pre-configure: ${SUBST_CMD} ${WRKSRC}/Makefile Index: databases/postgresql-pllua/distinfo =================================================================== RCS file: /cvs/ports/databases/postgresql-pllua/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- databases/postgresql-pllua/distinfo 19 Feb 2019 05:10:51 -0000 1.3 +++ databases/postgresql-pllua/distinfo 2 Nov 2019 11:06:14 -0000 @@ -1,6 +1,2 @@ -SHA256 (3d926a6b0117f168e7a29a18bb16110fea2957c2.diff) = sZaSN8X5qFlXiYse226goM2l46g4af7Ha3wp/Bvuw/k= -SHA256 (3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff) = clMmZMUXJ3naJXriZ6CRStRb6L/OFyBxKf3Tqq++WAk= -SHA256 (v1.1.0.tar.gz) = LIpFfG3stYm1ukAp9IanwEZFMPh8y4Ngkh5NdmD+aXE= -SIZE (3d926a6b0117f168e7a29a18bb16110fea2957c2.diff) = 9711 -SIZE (3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff) = 8005 -SIZE (v1.1.0.tar.gz) = 53205 +SHA256 (REL_2_0_4.tar.gz) = mjuku/1dCfeLka5N4/Wnu7QS+F4r8fc8j6EOiIVzXrE= +SIZE (REL_2_0_4.tar.gz) = 211568 Index: databases/postgresql-pllua/patches/patch-Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql-pllua/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile --- databases/postgresql-pllua/patches/patch-Makefile 19 Feb 2019 05:10:51 -0000 1.2 +++ databases/postgresql-pllua/patches/patch-Makefile 4 Nov 2019 11:09:07 -0000 @@ -3,14 +3,23 @@ $OpenBSD: patch-Makefile,v 1.2 2019/02/1 Index: Makefile --- Makefile.orig +++ Makefile -@@ -6,8 +6,8 @@ PKG_LIBDIR := $(shell $(PG_CONFIG) --pkglibdir) - # Lua specific +@@ -13,8 +13,8 @@ PG_CONFIG ?= pg_config + PLLUA_CONFIG_OPTS ?= # General --LUA_INCDIR ?= /usr/include/lua5.1 --LUALIB ?= -L/usr/local/lib -llua5.1 +-LUA_INCDIR ?= /usr/local/include/lua53 +-LUALIB ?= -L/usr/local/lib -llua-5.3 +LUA_INCDIR ?= ${MODLUA_INCL_DIR} +LUALIB ?= -L${LOCALBASE}/lib -l${MODLUA_WANTLIB} + LUAC ?= luac53 + LUA ?= lua53 - # LuaJIT - #LUA_INCDIR = /usr/local/include/luajit-2.0 +@@ -37,7 +37,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. + +-BIN_LD ?= $(LD) -r -b binary ++BIN_LD ?= $(LD) ${LLD_EMUL} -r -b binary + + # If BIN_ARCH and BIN_FMT are defined, we assume LD_BINARY is broken + # and do this instead. This is apparently needed for linux-mips64el, Index: databases/postgresql-pllua/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/postgresql-pllua/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- databases/postgresql-pllua/pkg/PLIST 19 Feb 2019 05:10:51 -0000 1.3 +++ databases/postgresql-pllua/pkg/PLIST 4 Nov 2019 11:04:36 -0000 @@ -1,5 +1,14 @@ @comment $OpenBSD: PLIST,v 1.3 2019/02/19 05:10:51 jeremy Exp $ +include/postgresql/server/extension/pllua/ +include/postgresql/server/extension/pllua/pllua.h +include/postgresql/server/extension/pllua/pllua_luajit.h +include/postgresql/server/extension/pllua/pllua_luaver.h +include/postgresql/server/extension/pllua/pllua_pgver.h lib/postgresql/pllua.so share/doc/pkg-readmes/${PKGSTEM} -share/postgresql/extension/pllua--1.0.sql +share/postgresql/extension/pllua--1.0--2.0.sql +share/postgresql/extension/pllua--2.0.sql share/postgresql/extension/pllua.control +share/postgresql/extension/plluau--1.0--2.0.sql +share/postgresql/extension/plluau--2.0.sql +share/postgresql/extension/plluau.control Index: databases/citus/Makefile =================================================================== RCS file: /cvs/ports/databases/citus/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- databases/citus/Makefile 12 Jul 2019 20:43:52 -0000 1.6 +++ databases/citus/Makefile 4 Nov 2019 11:14:55 -0000 @@ -3,7 +3,7 @@ COMMENT = extension to horizontally scale PostgreSQL GH_ACCOUNT = citusdata GH_PROJECT = citus -GH_TAGNAME = v8.1.0 +GH_TAGNAME = v9.0.1 CATEGORIES = databases HOMEPAGE = https://www.citusdata.com/ Index: databases/citus/distinfo =================================================================== RCS file: /cvs/ports/databases/citus/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- databases/citus/distinfo 19 Feb 2019 05:14:54 -0000 1.4 +++ databases/citus/distinfo 4 Nov 2019 11:15:10 -0000 @@ -1,2 +1,2 @@ -SHA256 (citus-8.1.0.tar.gz) = MNP1HXcIB567StmDoMauqRfBHv6TW/++M3JGZ2vjaO0= -SIZE (citus-8.1.0.tar.gz) = 2820006 +SHA256 (citus-9.0.1.tar.gz) = u2mD9nDg9Ww3JQvvMgzVpq8hpfF3KLM0LmYISqMwfE8= +SIZE (citus-9.0.1.tar.gz) = 4232025 Index: databases/citus/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/citus/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- databases/citus/pkg/PLIST 19 Feb 2019 05:14:54 -0000 1.3 +++ databases/citus/pkg/PLIST 4 Nov 2019 11:17:59 -0000 @@ -2,6 +2,7 @@ include/postgresql/server/citus_version.h include/postgresql/server/distributed/ include/postgresql/server/distributed/backend_data.h +include/postgresql/server/distributed/citus_acquire_lock.h include/postgresql/server/distributed/citus_clauses.h include/postgresql/server/distributed/citus_custom_scan.h include/postgresql/server/distributed/citus_nodefuncs.h @@ -11,22 +12,27 @@ include/postgresql/server/distributed/co include/postgresql/server/distributed/commands.h include/postgresql/server/distributed/connection_management.h include/postgresql/server/distributed/deparse_shard_query.h +include/postgresql/server/distributed/deparser.h include/postgresql/server/distributed/distributed_deadlock_detection.h include/postgresql/server/distributed/distributed_planner.h include/postgresql/server/distributed/distribution_column.h +include/postgresql/server/distributed/enterprise.h include/postgresql/server/distributed/errormessage.h include/postgresql/server/distributed/extended_op_node_utils.h include/postgresql/server/distributed/foreign_key_relationship.h +include/postgresql/server/distributed/function_call_delegation.h include/postgresql/server/distributed/function_utils.h include/postgresql/server/distributed/hash_helpers.h include/postgresql/server/distributed/insert_select_executor.h include/postgresql/server/distributed/insert_select_planner.h include/postgresql/server/distributed/intermediate_results.h include/postgresql/server/distributed/listutils.h +include/postgresql/server/distributed/local_executor.h include/postgresql/server/distributed/lock_graph.h include/postgresql/server/distributed/maintenanced.h include/postgresql/server/distributed/master_metadata_utility.h include/postgresql/server/distributed/master_protocol.h +include/postgresql/server/distributed/memutils.h include/postgresql/server/distributed/metadata_cache.h include/postgresql/server/distributed/metadata_sync.h include/postgresql/server/distributed/multi_client_executor.h @@ -76,214 +82,67 @@ include/postgresql/server/distributed/tr include/postgresql/server/distributed/transaction_management.h include/postgresql/server/distributed/transaction_recovery.h include/postgresql/server/distributed/transmit.h +include/postgresql/server/distributed/tuplestore.h include/postgresql/server/distributed/version_compat.h include/postgresql/server/distributed/worker_manager.h include/postgresql/server/distributed/worker_protocol.h include/postgresql/server/distributed/worker_shard_visibility.h include/postgresql/server/distributed/worker_transaction.h lib/postgresql/citus.so -share/postgresql/extension/citus--5.0--5.0-1.sql -share/postgresql/extension/citus--5.0-1--5.0-2.sql -share/postgresql/extension/citus--5.0-1.sql -share/postgresql/extension/citus--5.0-2--5.1-1.sql -share/postgresql/extension/citus--5.0-2.sql -share/postgresql/extension/citus--5.0.sql -share/postgresql/extension/citus--5.1-1--5.1-2.sql -share/postgresql/extension/citus--5.1-1.sql -share/postgresql/extension/citus--5.1-2--5.1-3.sql -share/postgresql/extension/citus--5.1-2.sql -share/postgresql/extension/citus--5.1-3--5.1-4.sql -share/postgresql/extension/citus--5.1-3.sql -share/postgresql/extension/citus--5.1-4--5.1-5.sql -share/postgresql/extension/citus--5.1-4.sql -share/postgresql/extension/citus--5.1-5--5.1-6.sql -share/postgresql/extension/citus--5.1-5.sql -share/postgresql/extension/citus--5.1-6--5.1-7.sql -share/postgresql/extension/citus--5.1-6.sql -share/postgresql/extension/citus--5.1-7--5.1-8.sql -share/postgresql/extension/citus--5.1-7.sql -share/postgresql/extension/citus--5.1-8--5.2-1.sql -share/postgresql/extension/citus--5.1-8.sql -share/postgresql/extension/citus--5.2-1--5.2-2.sql -share/postgresql/extension/citus--5.2-1.sql -share/postgresql/extension/citus--5.2-2--5.2-3.sql -share/postgresql/extension/citus--5.2-2.sql -share/postgresql/extension/citus--5.2-3--5.2-4.sql -share/postgresql/extension/citus--5.2-3.sql -share/postgresql/extension/citus--5.2-4--6.0-1.sql -share/postgresql/extension/citus--5.2-4.sql -share/postgresql/extension/citus--6.0-1--6.0-2.sql -share/postgresql/extension/citus--6.0-1.sql -share/postgresql/extension/citus--6.0-10--6.0-11.sql -share/postgresql/extension/citus--6.0-10.sql -share/postgresql/extension/citus--6.0-11--6.0-12.sql -share/postgresql/extension/citus--6.0-11.sql -share/postgresql/extension/citus--6.0-12--6.0-13.sql -share/postgresql/extension/citus--6.0-12.sql -share/postgresql/extension/citus--6.0-13--6.0-14.sql -share/postgresql/extension/citus--6.0-13.sql -share/postgresql/extension/citus--6.0-14--6.0-15.sql -share/postgresql/extension/citus--6.0-14.sql -share/postgresql/extension/citus--6.0-15--6.0-16.sql -share/postgresql/extension/citus--6.0-15.sql -share/postgresql/extension/citus--6.0-16--6.0-17.sql -share/postgresql/extension/citus--6.0-16.sql -share/postgresql/extension/citus--6.0-17--6.0-18.sql -share/postgresql/extension/citus--6.0-17.sql -share/postgresql/extension/citus--6.0-18--6.1-1.sql -share/postgresql/extension/citus--6.0-18.sql -share/postgresql/extension/citus--6.0-2--6.0-3.sql -share/postgresql/extension/citus--6.0-2.sql -share/postgresql/extension/citus--6.0-3--6.0-4.sql -share/postgresql/extension/citus--6.0-3.sql -share/postgresql/extension/citus--6.0-4--6.0-5.sql -share/postgresql/extension/citus--6.0-4.sql -share/postgresql/extension/citus--6.0-5--6.0-6.sql -share/postgresql/extension/citus--6.0-5.sql -share/postgresql/extension/citus--6.0-6--6.0-7.sql -share/postgresql/extension/citus--6.0-6.sql -share/postgresql/extension/citus--6.0-7--6.0-8.sql -share/postgresql/extension/citus--6.0-7.sql -share/postgresql/extension/citus--6.0-8--6.0-9.sql -share/postgresql/extension/citus--6.0-8.sql -share/postgresql/extension/citus--6.0-9--6.0-10.sql -share/postgresql/extension/citus--6.0-9.sql -share/postgresql/extension/citus--6.1-1--6.1-2.sql -share/postgresql/extension/citus--6.1-1.sql -share/postgresql/extension/citus--6.1-10--6.1-11.sql -share/postgresql/extension/citus--6.1-10.sql -share/postgresql/extension/citus--6.1-11--6.1-12.sql -share/postgresql/extension/citus--6.1-11.sql -share/postgresql/extension/citus--6.1-12--6.1-13.sql -share/postgresql/extension/citus--6.1-12.sql -share/postgresql/extension/citus--6.1-13--6.1-14.sql -share/postgresql/extension/citus--6.1-13.sql -share/postgresql/extension/citus--6.1-14--6.1-15.sql -share/postgresql/extension/citus--6.1-14.sql -share/postgresql/extension/citus--6.1-15--6.1-16.sql -share/postgresql/extension/citus--6.1-15.sql -share/postgresql/extension/citus--6.1-16--6.1-17.sql -share/postgresql/extension/citus--6.1-16.sql -share/postgresql/extension/citus--6.1-17--6.2-1.sql -share/postgresql/extension/citus--6.1-17.sql -share/postgresql/extension/citus--6.1-2--6.1-3.sql -share/postgresql/extension/citus--6.1-2.sql -share/postgresql/extension/citus--6.1-3--6.1-4.sql -share/postgresql/extension/citus--6.1-3.sql -share/postgresql/extension/citus--6.1-4--6.1-5.sql -share/postgresql/extension/citus--6.1-4.sql -share/postgresql/extension/citus--6.1-5--6.1-6.sql -share/postgresql/extension/citus--6.1-5.sql -share/postgresql/extension/citus--6.1-6--6.1-7.sql -share/postgresql/extension/citus--6.1-6.sql -share/postgresql/extension/citus--6.1-7--6.1-8.sql -share/postgresql/extension/citus--6.1-7.sql -share/postgresql/extension/citus--6.1-8--6.1-9.sql -share/postgresql/extension/citus--6.1-8.sql -share/postgresql/extension/citus--6.1-9--6.1-10.sql -share/postgresql/extension/citus--6.1-9.sql -share/postgresql/extension/citus--6.2-1--6.2-2.sql -share/postgresql/extension/citus--6.2-1.sql -share/postgresql/extension/citus--6.2-2--6.2-3.sql -share/postgresql/extension/citus--6.2-2.sql -share/postgresql/extension/citus--6.2-3--6.2-4.sql -share/postgresql/extension/citus--6.2-3.sql -share/postgresql/extension/citus--6.2-4--7.0-1.sql -share/postgresql/extension/citus--6.2-4.sql 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-10.sql share/postgresql/extension/citus--7.0-11--7.0-12.sql -share/postgresql/extension/citus--7.0-11.sql share/postgresql/extension/citus--7.0-12--7.0-13.sql -share/postgresql/extension/citus--7.0-12.sql share/postgresql/extension/citus--7.0-13--7.0-14.sql -share/postgresql/extension/citus--7.0-13.sql share/postgresql/extension/citus--7.0-14--7.0-15.sql -share/postgresql/extension/citus--7.0-14.sql share/postgresql/extension/citus--7.0-15--7.1-1.sql -share/postgresql/extension/citus--7.0-15.sql share/postgresql/extension/citus--7.0-2--7.0-3.sql -share/postgresql/extension/citus--7.0-2.sql share/postgresql/extension/citus--7.0-3--7.0-4.sql -share/postgresql/extension/citus--7.0-3.sql share/postgresql/extension/citus--7.0-4--7.0-5.sql -share/postgresql/extension/citus--7.0-4.sql share/postgresql/extension/citus--7.0-5--7.0-6.sql -share/postgresql/extension/citus--7.0-5.sql share/postgresql/extension/citus--7.0-6--7.0-7.sql -share/postgresql/extension/citus--7.0-6.sql share/postgresql/extension/citus--7.0-7--7.0-8.sql -share/postgresql/extension/citus--7.0-7.sql share/postgresql/extension/citus--7.0-8--7.0-9.sql -share/postgresql/extension/citus--7.0-8.sql share/postgresql/extension/citus--7.0-9--7.0-10.sql -share/postgresql/extension/citus--7.0-9.sql share/postgresql/extension/citus--7.1-1--7.1-2.sql -share/postgresql/extension/citus--7.1-1.sql share/postgresql/extension/citus--7.1-2--7.1-3.sql -share/postgresql/extension/citus--7.1-2.sql share/postgresql/extension/citus--7.1-3--7.1-4.sql -share/postgresql/extension/citus--7.1-3.sql share/postgresql/extension/citus--7.1-4--7.2-1.sql -share/postgresql/extension/citus--7.1-4.sql share/postgresql/extension/citus--7.2-1--7.2-2.sql -share/postgresql/extension/citus--7.2-1.sql share/postgresql/extension/citus--7.2-2--7.2-3.sql -share/postgresql/extension/citus--7.2-2.sql share/postgresql/extension/citus--7.2-3--7.3-1.sql -share/postgresql/extension/citus--7.2-3.sql share/postgresql/extension/citus--7.3-1--7.3-2.sql -share/postgresql/extension/citus--7.3-1.sql share/postgresql/extension/citus--7.3-2--7.3-3.sql -share/postgresql/extension/citus--7.3-2.sql share/postgresql/extension/citus--7.3-3--7.4-1.sql -share/postgresql/extension/citus--7.3-3.sql share/postgresql/extension/citus--7.4-1--7.4-2.sql -share/postgresql/extension/citus--7.4-1.sql share/postgresql/extension/citus--7.4-2--7.4-3.sql -share/postgresql/extension/citus--7.4-2.sql share/postgresql/extension/citus--7.4-3--7.5-1.sql -share/postgresql/extension/citus--7.4-3.sql share/postgresql/extension/citus--7.5-1--7.5-2.sql -share/postgresql/extension/citus--7.5-1.sql share/postgresql/extension/citus--7.5-2--7.5-3.sql -share/postgresql/extension/citus--7.5-2.sql share/postgresql/extension/citus--7.5-3--7.5-4.sql -share/postgresql/extension/citus--7.5-3.sql share/postgresql/extension/citus--7.5-4--7.5-5.sql -share/postgresql/extension/citus--7.5-4.sql share/postgresql/extension/citus--7.5-5--7.5-6.sql -share/postgresql/extension/citus--7.5-5.sql share/postgresql/extension/citus--7.5-6--7.5-7.sql -share/postgresql/extension/citus--7.5-6.sql share/postgresql/extension/citus--7.5-7--8.0-1.sql -share/postgresql/extension/citus--7.5-7.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-10.sql share/postgresql/extension/citus--8.0-11--8.0-12.sql -share/postgresql/extension/citus--8.0-11.sql share/postgresql/extension/citus--8.0-12--8.0-13.sql -share/postgresql/extension/citus--8.0-12.sql share/postgresql/extension/citus--8.0-13--8.1-1.sql -share/postgresql/extension/citus--8.0-13.sql share/postgresql/extension/citus--8.0-2--8.0-3.sql -share/postgresql/extension/citus--8.0-2.sql share/postgresql/extension/citus--8.0-3--8.0-4.sql -share/postgresql/extension/citus--8.0-3.sql share/postgresql/extension/citus--8.0-4--8.0-5.sql -share/postgresql/extension/citus--8.0-4.sql share/postgresql/extension/citus--8.0-5--8.0-6.sql -share/postgresql/extension/citus--8.0-5.sql share/postgresql/extension/citus--8.0-6--8.0-7.sql -share/postgresql/extension/citus--8.0-6.sql share/postgresql/extension/citus--8.0-7--8.0-8.sql -share/postgresql/extension/citus--8.0-7.sql share/postgresql/extension/citus--8.0-8--8.0-9.sql -share/postgresql/extension/citus--8.0-8.sql share/postgresql/extension/citus--8.0-9--8.0-10.sql -share/postgresql/extension/citus--8.0-9.sql +share/postgresql/extension/citus--8.1-1--8.2-1.sql +share/postgresql/extension/citus--8.2-1--8.2-2.sql +share/postgresql/extension/citus--8.2-2--8.2-3.sql +share/postgresql/extension/citus--8.2-3--8.2-4.sql +share/postgresql/extension/citus--8.2-4--8.3-1.sql +share/postgresql/extension/citus--8.3-1--9.0-1.sql +share/postgresql/extension/citus--9.0-1--9.0-2.sql share/postgresql/extension/citus.control Index: databases/pg_statsinfo/Makefile =================================================================== RCS file: /cvs/ports/databases/pg_statsinfo/Makefile,v retrieving revision 1.13 diff -u -p -u -p -r1.13 Makefile --- databases/pg_statsinfo/Makefile 12 Jul 2019 20:43:58 -0000 1.13 +++ databases/pg_statsinfo/Makefile 4 Nov 2019 11:30:26 -0000 @@ -2,7 +2,7 @@ COMMENT = monitor PostgreSQL activity & statistics -DISTNAME = pg_statsinfo-10.0 +DISTNAME = pg_statsinfo-11.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.4 diff -u -p -u -p -r1.4 distinfo --- databases/pg_statsinfo/distinfo 19 Feb 2019 05:10:26 -0000 1.4 +++ databases/pg_statsinfo/distinfo 4 Nov 2019 11:30:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (pg_statsinfo-10.0.tar.gz) = l/IPCUHrYI5JQFvZz83N06rXoZ4eb8TpNaHVkkp4DKM= -SIZE (pg_statsinfo-10.0.tar.gz) = 921560 +SHA256 (pg_statsinfo-11.0.tar.gz) = xB5KDSSKYtvpKcG2HAXqTQFiksLiL6WEU8hSveAaTvg= +SIZE (pg_statsinfo-11.0.tar.gz) = 922044 Index: databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c =================================================================== RCS file: databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c diff -N databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/pg_statsinfo/patches/patch-agent_lib_last_xact_activity_c 4 Nov 2019 11:55:45 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Work with PostgreSQL 12. + +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", 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.6 diff -u -p -u -p -r1.6 patch-agent_lib_libstatsinfo_c --- databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c 19 Feb 2019 05:10:26 -0000 1.6 +++ databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c 4 Nov 2019 11:55:49 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-agent_lib_libstatsinfo_c,v 1.6 2019/02/19 05:10:26 jeremy Exp $ -Work with PostgreSQL 10. +Work with PostgreSQL 12. Index: agent/lib/libstatsinfo.c --- agent/lib/libstatsinfo.c.orig @@ -13,8 +13,12 @@ Index: agent/lib/libstatsinfo.c #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> -@@ -37,6 +38,7 @@ - #include "utils/tqual.h" +@@ -34,9 +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" +#include "utils/varlena.h" @@ -29,16 +33,7 @@ Index: agent/lib/libstatsinfo.c if (!long_xacts) { -@@ -708,7 +711,7 @@ sample_activity(void) - "<IDLE> in transaction", pgstat_track_activity_query_size); - else - strlcpy(entry->query, -- be->st_activity, pgstat_track_activity_query_size); -+ be->st_activity_raw, pgstat_track_activity_query_size); - #else - strlcpy(entry->query, - be->st_activity, pgstat_track_activity_query_size); -@@ -1882,9 +1885,11 @@ statsinfo_restart(PG_FUNCTION_ARGS) +@@ -1887,9 +1890,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" */ @@ -50,7 +45,7 @@ Index: agent/lib/libstatsinfo.c /* * statsinfo_cpustats - get cpu information -@@ -1923,6 +1928,7 @@ statsinfo_cpustats_noarg(PG_FUNCTION_ARGS) +@@ -1928,6 +1933,7 @@ statsinfo_cpustats_noarg(PG_FUNCTION_ARGS) PG_RETURN_DATUM(get_cpustats(fcinfo, 0, 0, 0, 0)); } @@ -58,7 +53,7 @@ Index: agent/lib/libstatsinfo.c static Datum get_cpustats(FunctionCallInfo fcinfo, int64 prev_cpu_user, -@@ -1935,6 +1941,59 @@ get_cpustats(FunctionCallInfo fcinfo, +@@ -1940,6 +1946,59 @@ get_cpustats(FunctionCallInfo fcinfo, int64 cpu_system; int64 cpu_idle; int64 cpu_iowait; @@ -118,7 +113,7 @@ Index: agent/lib/libstatsinfo.c List *records = NIL; List *fields = NIL; HeapTuple tuple; -@@ -2007,6 +2066,7 @@ get_cpustats(FunctionCallInfo fcinfo, +@@ -2012,6 +2071,7 @@ get_cpustats(FunctionCallInfo fcinfo, return HeapTupleGetDatum(tuple); } @@ -126,7 +121,7 @@ Index: agent/lib/libstatsinfo.c #define NUM_DEVICESTATS_COLS 17 #define TYPE_DEVICE_TABLESPACES TEXTOID -@@ -2180,10 +2240,46 @@ statsinfo_devicestats(PG_FUNCTION_ARGS) +@@ -2185,10 +2245,46 @@ statsinfo_devicestats(PG_FUNCTION_ARGS) /* * statsinfo_loadavg - get loadavg information */ @@ -173,7 +168,7 @@ Index: agent/lib/libstatsinfo.c int fd; char buffer[256]; int nbytes; -@@ -2242,6 +2338,7 @@ statsinfo_loadavg(PG_FUNCTION_ARGS) +@@ -2247,6 +2343,7 @@ statsinfo_loadavg(PG_FUNCTION_ARGS) return HeapTupleGetDatum(tuple); } @@ -181,7 +176,7 @@ Index: agent/lib/libstatsinfo.c #define FILE_MEMINFO "/proc/meminfo" #define NUM_MEMORY_COLS 5 -@@ -2261,6 +2358,7 @@ compare_meminfo_table(const void *a, const void *b) +@@ -2266,6 +2363,7 @@ compare_meminfo_table(const void *a, const void *b) /* * statsinfo_memory - get memory information */ @@ -189,7 +184,7 @@ Index: agent/lib/libstatsinfo.c Datum statsinfo_memory(PG_FUNCTION_ARGS) { -@@ -2268,6 +2366,36 @@ statsinfo_memory(PG_FUNCTION_ARGS) +@@ -2273,6 +2371,36 @@ statsinfo_memory(PG_FUNCTION_ARGS) HeapTuple tuple; Datum values[NUM_MEMORY_COLS]; bool nulls[NUM_MEMORY_COLS]; @@ -226,7 +221,7 @@ Index: agent/lib/libstatsinfo.c int fd; char buffer[2048]; int nbytes; -@@ -2366,6 +2494,7 @@ nextline: +@@ -2371,6 +2499,7 @@ nextline: return HeapTupleGetDatum(tuple); } @@ -234,7 +229,7 @@ Index: agent/lib/libstatsinfo.c #define FILE_PROFILE "/proc/systemtap/statsinfo_prof/profile" #define NUM_PROFILE_COLS 3 -@@ -2374,9 +2503,16 @@ nextline: +@@ -2379,9 +2508,16 @@ nextline: /* * statsinfo_profile - get profile information */ @@ -251,7 +246,7 @@ Index: agent/lib/libstatsinfo.c ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; TupleDesc tupdesc; Tuplestorestate *tupstore; -@@ -2483,6 +2619,7 @@ statsinfo_profile(PG_FUNCTION_ARGS) +@@ -2488,6 +2624,7 @@ statsinfo_profile(PG_FUNCTION_ARGS) PG_RETURN_VOID(); } @@ -259,3 +254,49 @@ 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/skytools/Makefile =================================================================== RCS file: /cvs/ports/databases/skytools/Makefile,v retrieving revision 1.30 diff -u -p -u -p -r1.30 Makefile --- databases/skytools/Makefile 12 Jul 2019 20:44:02 -0000 1.30 +++ databases/skytools/Makefile 4 Nov 2019 12:47:20 -0000 @@ -5,7 +5,7 @@ COMMENT= PostgreSQL tools from Skype # XXX outdated; http://pgfoundry.org/frs/download.php/3622/skytools-3.2.tar.gz MODPY_EGG_VERSION= 3.1.1 DISTNAME= skytools-${MODPY_EGG_VERSION} -REVISION= 5 +REVISION= 6 CATEGORIES= databases @@ -22,9 +22,9 @@ MASTER_SITES= https://github.com/downloa MODULES= lang/python -BUILD_DEPENDS= databases/postgresql,-server>11 \ - databases/postgresql,-main>11 -LIB_DEPENDS= databases/postgresql,-main +BUILD_DEPENDS= databases/postgresql,-server>=12 \ + databases/postgresql,-main>=12 +LIB_DEPENDS= databases/postgresql,-main>=12 RUN_DEPENDS= databases/py-psycopg2 NO_TEST= Yes 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.1 diff -u -p -u -p -r1.1 patch-sql_pgq_triggers_stringutil_c --- databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c 18 Dec 2016 18:21:40 -0000 1.1 +++ databases/skytools/patches/patch-sql_pgq_triggers_stringutil_c 4 Nov 2019 12:47:35 -0000 @@ -3,9 +3,16 @@ $OpenBSD: patch-sql_pgq_triggers_stringu Fix build on PostgreSQL 9.6, patch taken from https://github.com/markokr/skytools/pull/56 ---- sql/pgq/triggers/stringutil.c.orig Tue Nov 1 04:28:50 2016 -+++ sql/pgq/triggers/stringutil.c Tue Nov 1 04:28:53 2016 -@@ -19,7 +19,11 @@ +More fixes for PostgreSQL 12. + +Index: sql/pgq/triggers/stringutil.c +--- sql/pgq/triggers/stringutil.c.orig ++++ sql/pgq/triggers/stringutil.c +@@ -16,10 +16,15 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#include <strings.h> #include <postgres.h> #include <lib/stringinfo.h> #include <mb/pg_wchar.h> @@ -17,3 +24,31 @@ https://github.com/markokr/skytools/pull #include <utils/memutils.h> #include "stringutil.h" +@@ -146,23 +151,10 @@ static int pgq_quote_literal(char *dst, const uint8 *s + /* check if ident is keyword that needs quoting */ + static bool is_keyword(const char *ident) + { +- const ScanKeyword *kw; +- +- /* do the lookup */ +-#if PG_VERSION_NUM >= 80500 +- kw = ScanKeywordLookup(ident, ScanKeywords, NumScanKeywords); +-#else +- kw = ScanKeywordLookup(ident); +-#endif +- +- /* unreserved? */ +-#if PG_VERSION_NUM >= 80300 +- if (kw && kw->category == UNRESERVED_KEYWORD) +- return false; +-#endif +- +- /* found anything? */ +- return kw != NULL; ++#define PG_KEYWORD(kwname, id, value) if(strcasecmp(kwname, ident) == 0) return true; ++#include <parser/kwlist.h> ++#undef PG_KEYWORD ++ return false; + } + + /* Index: databases/kdb/patches/patch-src_drivers_postgresql_PostgresqlTypes_cpp =================================================================== RCS file: databases/kdb/patches/patch-src_drivers_postgresql_PostgresqlTypes_cpp diff -N databases/kdb/patches/patch-src_drivers_postgresql_PostgresqlTypes_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/kdb/patches/patch-src_drivers_postgresql_PostgresqlTypes_cpp 5 Nov 2019 02:11:13 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ + +Fix build with PostgreSQL 12, from upstream commit +40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911. + +Index: src/drivers/postgresql/PostgresqlTypes.cpp +--- src/drivers/postgresql/PostgresqlTypes.cpp.orig ++++ src/drivers/postgresql/PostgresqlTypes.cpp +@@ -36,6 +36,7 @@ + #endif + #include <libpq-fe.h> + #include <catalog/pg_type.h> // needed for BOOLOID, etc. ++#include <pg_config.h> // needed for PG_VERSION_NUM + + #ifdef _MSC_VER + #pragma warning( pop ) +@@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap() + //! @todo POLYGONOID geometric polygon '(pt1,...)' + m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double); + m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double); ++#if PG_VERSION_NUM < 120000 + m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date); + m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date); ++#endif + //! @todo TINTERVALOID (abstime,abstime), time interval + //! @todo CIRCLEOID geometric circle '(center,radius)' + //! @todo CASHOID monetary amounts, $d,ddd.cc Index: x11/qt3/patches/patch-src_sql_drivers_psql_qsql_psql_cpp =================================================================== RCS file: x11/qt3/patches/patch-src_sql_drivers_psql_qsql_psql_cpp diff -N x11/qt3/patches/patch-src_sql_drivers_psql_qsql_psql_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/qt3/patches/patch-src_sql_drivers_psql_qsql_psql_cpp 5 Nov 2019 01:54:32 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix build with PostgreSQL 12. + +Index: src/sql/drivers/psql/qsql_psql.cpp +--- src/sql/drivers/psql/qsql_psql.cpp.orig ++++ src/sql/drivers/psql/qsql_psql.cpp +@@ -140,8 +140,6 @@ static QVariant::Type qDecodePSQLType( int t ) + case FLOAT8OID : + type = QVariant::Double; + break; +- case ABSTIMEOID : +- case RELTIMEOID : + case DATEOID : + type = QVariant::Date; + break;